Added composer.lock

b43591ee · Alexander Makarov · 5a52503d · b43591ee · b43591ee
Commit b43591ee authored Nov 20, 2014 by Alexander Makarov
Expand all Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

.gitignore .gitignore +2 -3

composer.lock composer.lock +0 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,8 @@ Thumbs.db
 # composer itself is not needed
 composer.phar
-# composer.lock should not be committed as we always want the latest versions
-/composer.lock
+# composer.lock in applications is ignored since it's automatically created by composer when application is installed
-# composer.lock in applications is ignored in dev repo, will be committed in checked out app repos
 /apps/*/composer.lock
 # Mac DS_Store Files

--- a/composer.lock
+++ b/composer.lock