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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 021bc9be273ff5d4456244db843fbb58d5407cd9..6a2c59159a9b6dcac6974cc26e2e2485bb9a71c9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ public/assets
 public/attachments
 tmp
 .DS_Store
+*~
+doc