summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index c645a3c6..5df0b2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ log/wiki/*
!log/admin/.gitkeep
!log/crm/.gitkeep
!log/wiki/.gitkeep
+!log/crm/ConfigAndLog/.gitkeep
etc/global_config.php
etc/nginx/*
@@ -33,10 +34,10 @@ files/wiki/*
tmp/crm/*
!tmp/crm/.gitkeep
-tmp/wiki/*
-!tmp/wiki/.gitkeep
tmp/wiki/cache/*
!tmp/wiki/cache/.gitkeep
+tmp/wiki/*
+!tmp/wiki/.gitkeep
www/wiki/LocalSettings.php
www/wiki/robots.txt
@@ -49,3 +50,5 @@ www/crm/wp-content/uploads/civicrm/templates_c/*
www/crm/wp-content/uploads/civicrm/upload/cache/*
!www/crm/wp-content/uploads/civicrm/upload/cache/.gitkeep
www/crm/wp-content/uploads/civicrm/upload/*
+!www/crm/wp-content/uploads/civicrm/ConfigAndLog/.gitkeep
+www/crm/wp-content/uploads/civicrm/ConfigAndLog/*