diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-02 22:29:34 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-02 22:29:34 -0200 |
| commit | 6e55b32e98fcaad82184d2e21ee611a3465e4b20 (patch) | |
| tree | e316b8ca72f2bef50668c222400a159b36fbc090 /.gitignore | |
| parent | c2e97cb410d759f383d29920165abdbf4b70e019 (diff) | |
| parent | 399909b11c094ab32542d300c72940b1b263b8e6 (diff) | |
| download | rails-6e55b32e98fcaad82184d2e21ee611a3465e4b20.tar.gz rails-6e55b32e98fcaad82184d2e21ee611a3465e4b20.tar.bz2 rails-6e55b32e98fcaad82184d2e21ee611a3465e4b20.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 70b7c0057a..9a65e4996f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,16 +7,9 @@ activerecord/doc actionpack/doc actionmailer/doc activesupport/doc -activemodel/pkg -activeresource/pkg -activerecord/pkg -actionpack/pkg activemodel/test/fixtures/fixture_database.sqlite3 -actionmailer/pkg -activesupport/pkg actionpack/test/tmp activesupport/test/fixtures/isolation_test -railties/pkg railties/test/500.html railties/test/fixtures/tmp railties/test/initializer/root/log @@ -31,3 +24,4 @@ railties/guides/output bin vendor/gems/ railties/tmp +pkg |