X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=.gitignore;h=2b816aa5a04e87d1010bfe04f285f9d776c25556;hb=c3d2bf84c6cd14ef48f719df9c323e04daa874ab;hp=9e086e9b90955495844c45550cbb59b7525322de;hpb=aa5a49b90800a3c25fb604a1d7fb53ea4fe369a3;p=civicrm-core.git

diff --git a/.gitignore b/.gitignore
index 9e086e9b90..2b816aa5a0 100644
--- 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