fixed generated data for CRM-15934

[civicrm-core.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e1901e79e238d4277d248b6181fdfa2fcfa6d6bb..9e557754c1a9b91125381a85adf83cdabe6c3a74 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *~
 *.bak
 bower_components
+composer.lock
 CRM/ACL/DAO
 CRM/Activity/DAO
 CRM/Auction/DAO
@@ -146,6 +147,7 @@ drupal/
 WordPress
 joomla
 packages/
+tests/output
 tests/phpunit/CiviTest/civicrm.settings.local.php
 tests/phpunit/CiviTest/truncate.xml
 tools/scripts/releaser/releaser.conf