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 #7181 from eileenmcnaughton/CRM-17335-2
[civicrm-core.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 9e086e9b90955495844c45550cbb59b7525322de..b6b605e2ce11822045d8b50d12418c59a210f587 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,7
+1,6
@@
*~
*.bak
bower_components
*~
*.bak
bower_components
-composer.lock
CRM/ACL/DAO
CRM/Activity/DAO
CRM/Auction/DAO
CRM/ACL/DAO
CRM/Activity/DAO
CRM/Auction/DAO
@@
-83,6
+82,7
@@
CRM/Core/DAO/PrintLabel.php
CRM/Core/DAO/RecurringEntity.php
CRM/Core/DAO/Setting.php
CRM/Core/DAO/StateProvince.php
CRM/Core/DAO/RecurringEntity.php
CRM/Core/DAO/Setting.php
CRM/Core/DAO/StateProvince.php
+CRM/Core/DAO/StatusPreference.php
CRM/Core/DAO/SystemLog.php
CRM/Core/DAO/Tag.php
CRM/Core/DAO/Timezone.php
CRM/Core/DAO/SystemLog.php
CRM/Core/DAO/Tag.php
CRM/Core/DAO/Timezone.php
@@
-94,6
+94,7
@@
CRM/Core/DAO/Website.php
CRM/Core/DAO/WordReplacement.php
CRM/Core/DAO/Worldregion.php
CRM/Core/I18n/SchemaStructure.php
CRM/Core/DAO/WordReplacement.php
CRM/Core/DAO/Worldregion.php
CRM/Core/I18n/SchemaStructure.php
+CRM/Cxn/DAO
CRM/Dedupe/DAO
CRM/Event/Cart/DAO
CRM/Event/DAO
CRM/Dedupe/DAO
CRM/Event/Cart/DAO
CRM/Event/DAO
@@
-147,6
+148,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