Merge branch 'master' into overpass

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 74094e8b3b468cb3ec6f02fa5f6daeb61c8f449b..e507f9430496225b457220ff16ca916d1ac319bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
 log
+config/piwik.yml
+public/assets
+public/attachments
+public/export
 tmp
+.DS_Store
+*~
+doc
+.vagrant