Merge branch 'master' into routing

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 18e616bf6005fda508ae1cf1efa8e22f0483a843..edfd387abad0782b71b6af3401935aad2df2ef37 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,13 @@
 log
 log

+config/piwik.yml
+public/assets
+public/attachments
+public/export

 tmp
 .DS_Store
 tmp
 .DS_Store

+*~
+doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
\ No newline at end of file