Dedupe permissions - allow safe mode merging based on 'merge duplicate contacts'

[civicrm-core.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4e204a5b202cbd51a87a7ac5488723ef064993a9..fd86ffe726cee93135cbe60ef4d7aa62701534dd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *~
 *.bak
 .use-civicrm-setup
+/ext/
 backdrop/
 bower_components
 CRM/Case/xml/configuration
@@ -24,7 +25,8 @@ tests/phpunit/CiviTest/CiviSeleniumSettings.php
 tests/phpunit/CiviTest/civicrm.settings.php
 tools/stats/config.php
 authors.txt
-drupal/
+/drupal/
+/drupal-8/
 WordPress
 joomla
 packages/
@@ -41,3 +43,4 @@ civicrm.settings.php
 sql/dummy_processor.mysql
 distmaker/distmaker.conf
 distmaker/out
+/tmp