Merge pull request #2 from ViGo5190/develop

[fix] composer lock
kot13 · Dec 24, 2016 · f65d8f8 · f65d8f8
2 parents bb81d02 + 987ad8a
commit f65d8f8
Show file tree

Hide file tree

Showing 2 changed files with 1,806 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,6 @@ Thumbs.db
 # composer
 /vendor
 composer.phar
-composer.lock
 
 # version info file
 version.json