Merge remote-tracking branch 'upstream/pull/3647'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1328658c6ab5b70d2809f6c665e51ff05b447514..75e9eb59e73fe2fb5dfe474e590dfed8fd748c67 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 .vagrant
 app/assets/javascripts/i18n
 config/environments/*.local.yml
 .vagrant
 app/assets/javascripts/i18n
 config/environments/*.local.yml

-config/piwik.yml

 config/settings.local.yml
 config/settings/*.local.yml
 coverage
 config/settings.local.yml
 config/settings/*.local.yml
 coverage


@@ -18,3 +17,6 @@ public/attachments
 public/export
 storage
 tmp
 public/export
 storage
 tmp

+
+# docker-compose database directory
+docker-db-data