Merge branch 'master' into iD-2.19.6

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 386f0513af861f01cb92952a2cb6e2306346e799..73316769e63ae7989ff9507682a1011cdf9db21a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,8 @@ node_modules
 public/assets
 public/attachments
 public/export
 public/assets
 public/attachments
 public/export

+storage

 tmp
 tmp

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