Permalink
Browse files

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

…nto telemachus-fix-gitignore
  • Loading branch information...
2 parents 99f751f + 9141c1f commit 8adfede96e269ec51f3c52e4e33c8ac63516d546 @mikel mikel committed Jan 29, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/lib/rails/generators/rails/app/templates/gitignore
View
2 railties/lib/rails/generators/rails/app/templates/gitignore
@@ -1,4 +1,4 @@
.bundle
db/*.sqlite3
log/*.log
-tmp/**/*
+tmp/

0 comments on commit 8adfede

Please sign in to comment.