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

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

diff --git a/.gitignore b/.gitignore
index f86d474..ad907fa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ nbproject
 .DS_Store
 .idea
 .project
-.settings
\ No newline at end of file
+.settings
+composer.lock