Merge pull request #17 from danstowell/jsrouting-clearsearch

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6a2c59159a9b6dcac6974cc26e2e2485bb9a71c9..837249e00a04b432e8b8577d1d5be5b21a149c44 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 log
+config/piwik.yml
 public/assets
 public/attachments
+public/export
 tmp
 .DS_Store
 *~