diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-06-25 12:12:30 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-06-25 12:12:30 +0100 |
| commit | 01571c0fd73a31f78411d6cad6484ddd82ec4778 (patch) | |
| tree | d0565f7ad3fd5a65aafbf191170094b90d7ef543 /.gitignore | |
| parent | b5e9badea281ce0c371ff1c00461febe66f4e2b2 (diff) | |
| parent | 670e22e3724791f51d639f409930fba5af920081 (diff) | |
| download | rails-01571c0fd73a31f78411d6cad6484ddd82ec4778.tar.gz rails-01571c0fd73a31f78411d6cad6484ddd82ec4778.tar.bz2 rails-01571c0fd73a31f78411d6cad6484ddd82ec4778.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_view/helpers/javascript_helper.rb
activesupport/lib/active_support/dependencies.rb
activesupport/lib/active_support/inflector.rb
activesupport/lib/active_support/values/time_zone.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8c5dfb64e1..bba7d5dce8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ debug.log +doc/rdoc activeresource/doc activerecord/doc actionpack/doc |