Merge remote-tracking branch 'osmlab/id-default'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 18e616bf6005fda508ae1cf1efa8e22f0483a843..2e7dfe16e7b101f26c708360b2bea178062a91dc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 log
+public/assets
+public/attachments
 tmp
 .DS_Store
+*~