Merge branch 'overpass'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 021bc9be273ff5d4456244db843fbb58d5407cd9..edfd387abad0782b71b6af3401935aad2df2ef37 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,13 @@
 log
+config/piwik.yml
 public/assets
 public/attachments
+public/export
 tmp
 .DS_Store
+*~
+doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
\ No newline at end of file