Merge branch 'fix-gitignore' of https://github.com/telemachus/rails into telemachus-fix-gitignore

2011-01-30 00:06:03 +11:00 · 2011-01-30 00:06:03 +11:00 · 8adfede96e
commit 8adfede96e
parent 99f751ffef 9141c1fa6d
1 changed files with 1 additions and 1 deletions
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@ -1,4 +1,4 @@
 .bundle
 db/*.sqlite3
 log/*.log
-tmp/**/*
+tmp/