Merge pull request #302 from gianarb/feature/composer-lock

Maks3w · Maks3w · commit ed95ef1eb6ed · 2015-08-28T09:24:59.000+02:00
Fixed #301 composer.lock mismatch
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,5 @@ nbproject
 .idea
 .project
 .settings
-composer.lock
 vendor
 composer.phar
