Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-12-16-09-32

[civicrm-core.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e1901e79e238d4277d248b6181fdfa2fcfa6d6bb..9e086e9b90955495844c45550cbb59b7525322de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *~
 *.bak
 bower_components
+composer.lock
 CRM/ACL/DAO
 CRM/Activity/DAO
 CRM/Auction/DAO