Merge branch 'master' into routing

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2e7dfe16e7b101f26c708360b2bea178062a91dc..edfd387abad0782b71b6af3401935aad2df2ef37 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +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