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 a4bec5489c6fd38e141498ec32c3d15e9aeccf94..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
@@ -78,6 +80,7 @@ CRM/Core/DAO/PriceField.php
 CRM/Core/DAO/PriceSet.php
 CRM/Core/DAO/PriceSetEntity.php
 CRM/Core/DAO/PrintLabel.php
+CRM/Core/DAO/RecurringEntity.php
 CRM/Core/DAO/Setting.php
 CRM/Core/DAO/StateProvince.php
 CRM/Core/DAO/SystemLog.php
@@ -112,6 +115,7 @@ civicrm-version.php
 civicrm-version.txt
 civicrm.config.php
 install/langs.php
+node_modules
 packages/.channels
 packages/.depdb
 packages/.depdblock
@@ -154,3 +158,4 @@ vendor
 civicrm.settings.php
 sql/dummy_processor.mysql
 distmaker/distmaker.conf
+distmaker/out