From: Maks <github.maks3w@virtualplanets.net>
Date: Sun, 5 Aug 2012 15:45:26 +0000 (-0700)
Subject: Merge pull request #102 from gerardroche/patch-2
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=7cebc10e7e37a82de2de9df6510ad93f2c35401d;hp=4ecb27ec28c1fd36be3f68a80d5cf3c082d23505;p=zf2.biz%2Fapplication_blanche.git

Merge pull request #102 from gerardroche/patch-2

Add composer.lock file to ignore list
---

diff --git a/.gitignore b/.gitignore
index 6ab883d..ad907fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ nbproject
 .idea
 .project
 .settings
+composer.lock