diff options
| author | Mikel Lindsaar <mikel@rubyx.com> | 2011-01-30 00:06:03 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <mikel@rubyx.com> | 2011-01-30 00:06:03 +1100 |
| commit | 8adfede96e269ec51f3c52e4e33c8ac63516d546 (patch) | |
| tree | d0960f443dc156cd2047935dd98a6c5558888cc7 /railties | |
| parent | 99f751ffef3e2feb6baf2778f66a32e86ae18956 (diff) | |
| parent | 9141c1fa6d54024d8bd73774633cf79a601d1dfa (diff) | |
| download | rails-8adfede96e269ec51f3c52e4e33c8ac63516d546.tar.gz rails-8adfede96e269ec51f3c52e4e33c8ac63516d546.tar.bz2 rails-8adfede96e269ec51f3c52e4e33c8ac63516d546.zip | |
Merge branch 'fix-gitignore' of https://github.com/telemachus/rails into telemachus-fix-gitignore
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index af64fae5e7..f0fa30c536 100644 --- 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/ |