diff options
author | Xavier Noria <fxn@hashref.com> | 2011-03-05 12:06:43 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-03-05 12:06:43 +0100 |
commit | 9092052cb010ab9155cff196ef139cec41695324 (patch) | |
tree | 6b8f39ddddef07105820ce825260ebc4e265b12a /.gitignore | |
parent | 34f5628a072f7afa677d25c9559076d5c21721ce (diff) | |
parent | 20768176292cbcb883ab152b4aa9ed8c664771cd (diff) | |
download | rails-9092052cb010ab9155cff196ef139cec41695324.tar.gz rails-9092052cb010ab9155cff196ef139cec41695324.tar.bz2 rails-9092052cb010ab9155cff196ef139cec41695324.zip |
merges rails
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 35402a22f7..8daa1e4dcd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ activerecord/doc actionpack/doc actionmailer/doc activesupport/doc +activesupport/test/tmp activemodel/test/fixtures/fixture_database.sqlite3 actionpack/test/tmp activesupport/test/fixtures/isolation_test |