Merge remote-tracking branch 'openstreetmap/pull/1347' into master
[rails.git] / .gitignore
index 6a2c591..920ca11 100644 (file)
@@ -1,7 +1,14 @@
 log
+config/piwik.yml
 public/assets
 public/attachments
+public/export
 tmp
 .DS_Store
 *~
 doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage