Merge branch 'master' into notes-search

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6a2c59159a9b6dcac6974cc26e2e2485bb9a71c9..1a2d35c6a28cc056de2646690384138a52a03caf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,15 @@
 log
+config/piwik.yml
+app/assets/javascripts/i18n
 public/assets
 public/attachments
+public/export
 tmp
 .DS_Store
 *~
 doc
+.vagrant
+.ruby-gemset
+.ruby-version
+.idea
+coverage