X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=.gitignore;h=b6b605e2ce11822045d8b50d12418c59a210f587;hb=8ec935aa882593780ad219deaad883d2077bcf3f;hp=9e086e9b90955495844c45550cbb59b7525322de;hpb=414b3228db09432f1e389a89f9fb9e3f22d0f2da;p=civicrm-core.git

diff --git a/.gitignore b/.gitignore
index 9e086e9b90..b6b605e2ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 *~
 *.bak
 bower_components
-composer.lock
 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/StatusPreference.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/Cxn/DAO
 CRM/Dedupe/DAO
 CRM/Event/Cart/DAO
 CRM/Event/DAO
@@ -147,6 +148,7 @@ drupal/
 WordPress
 joomla
 packages/
+tests/output
 tests/phpunit/CiviTest/civicrm.settings.local.php
 tests/phpunit/CiviTest/truncate.xml
 tools/scripts/releaser/releaser.conf