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 29d3ae37142f600526ba909a2d961c53f39a2fa9..9e086e9b90955495844c45550cbb59b7525322de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *~
 *.bak
+bower_components
+composer.lock
 CRM/ACL/DAO
 CRM/Activity/DAO
 CRM/Auction/DAO
@@ -113,6 +115,7 @@ civicrm-version.php
 civicrm-version.txt
 civicrm.config.php
 install/langs.php
+node_modules
 packages/.channels
 packages/.depdb
 packages/.depdblock