Merge remote-tracking branch 'jfirebaugh/legacy-params'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2b8b7bd68ae25333db8773682be1566e03bcd1c7..6a2c59159a9b6dcac6974cc26e2e2485bb9a71c9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 log
 public/assets
+public/attachments
 tmp
 .DS_Store
+*~
+doc