Merge branch 'master' into overpass

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 021bc9be273ff5d4456244db843fbb58d5407cd9..e507f9430496225b457220ff16ca916d1ac319bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
 log
 log

+config/piwik.yml

 public/assets
 public/attachments
 public/assets
 public/attachments

+public/export

 tmp
 .DS_Store
 tmp
 .DS_Store

+*~
+doc
+.vagrant