Merge remote-tracking branch 'openstreetmap/pull/891'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6bfe6b19e3753a35e40496a9f2b2ab1722f65055..920ca1120ba51aa6171900e39560d36c48d1343f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,14 @@
 log
+config/piwik.yml
+public/assets
+public/attachments
+public/export
+tmp
+.DS_Store
+*~
+doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage