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 #5304 from colemanw/CRM-15932
[civicrm-core.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 9e086e9b90955495844c45550cbb59b7525322de..2b816aa5a04e87d1010bfe04f285f9d776c25556 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,7
+1,6
@@
*~
*.bak
bower_components
-composer.lock
CRM/ACL/DAO
CRM/Activity/DAO
CRM/Auction/DAO
@@
-147,6
+146,7
@@
drupal/
WordPress
joomla
packages/
+tests/output
tests/phpunit/CiviTest/civicrm.settings.local.php
tests/phpunit/CiviTest/truncate.xml
tools/scripts/releaser/releaser.conf