Merge branch 'master' into notes-search

[rails.git] / .gitignore

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