diff options
author | Neeraj Singh <neerajdotname@gmail.com> | 2010-11-22 17:32:27 -0500 |
---|---|---|
committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-11-22 17:32:27 -0500 |
commit | 5debc65c356c619bce20dcc10c0befc7c4204ef5 (patch) | |
tree | dc32bab1eccd11bacdaff70f25696689a2b9dc66 /.gitignore | |
parent | 1c68e55ae5e90b7c072a1f6030ea3dd4becd8a07 (diff) | |
parent | 818b366c3e3645b3375ee0b1d1023621dbeaede2 (diff) | |
download | rails-5debc65c356c619bce20dcc10c0befc7c4204ef5.tar.gz rails-5debc65c356c619bce20dcc10c0befc7c4204ef5.tar.bz2 rails-5debc65c356c619bce20dcc10c0befc7c4204ef5.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 2dfdf96e7f..a18fba3780 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ activesupport/doc activemodel/test/fixtures/fixture_database.sqlite3 actionpack/test/tmp activesupport/test/fixtures/isolation_test +dist railties/test/500.html railties/test/fixtures/tmp railties/test/initializer/root/log |