Merge pull request #17 from danstowell/jsrouting-clearsearch

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 18e616bf6005fda508ae1cf1efa8e22f0483a843..837249e00a04b432e8b8577d1d5be5b21a149c44 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 log
+config/piwik.yml
+public/assets
+public/attachments
+public/export
 tmp
 .DS_Store
+*~
+doc