projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5202 from totten/master-civimail-task
[civicrm-core.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index a4bec5489c6fd38e141498ec32c3d15e9aeccf94..9e557754c1a9b91125381a85adf83cdabe6c3a74 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,5
+1,7
@@
*~
*.bak
*~
*.bak
+bower_components
+composer.lock
CRM/ACL/DAO
CRM/Activity/DAO
CRM/Auction/DAO
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/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
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
civicrm-version.txt
civicrm.config.php
install/langs.php
+node_modules
packages/.channels
packages/.depdb
packages/.depdblock
packages/.channels
packages/.depdb
packages/.depdblock
@@
-143,6
+147,7
@@
drupal/
WordPress
joomla
packages/
WordPress
joomla
packages/
+tests/output
tests/phpunit/CiviTest/civicrm.settings.local.php
tests/phpunit/CiviTest/truncate.xml
tools/scripts/releaser/releaser.conf
tests/phpunit/CiviTest/civicrm.settings.local.php
tests/phpunit/CiviTest/truncate.xml
tools/scripts/releaser/releaser.conf
@@
-154,3
+159,4
@@
vendor
civicrm.settings.php
sql/dummy_processor.mysql
distmaker/distmaker.conf
civicrm.settings.php
sql/dummy_processor.mysql
distmaker/distmaker.conf
+distmaker/out