Merge branch 'master' of ../application-blanche

[zf2.biz/galerie.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 11b4e7a..ad907fa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-composer.lock
 nbproject
 ._*
 .~lock.*
@@ -7,3 +6,4 @@ nbproject
 .idea
 .project
 .settings
+composer.lock