diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-28 15:38:24 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-28 15:38:24 +0100 |
| commit | 5abe63c419de22cb1b95334d8741a32cd175a0d7 (patch) | |
| tree | e697e85d8699654f04a790e5dc323c7007e87e31 /doc | |
| parent | de211914d84737c4314e862b459b9a23a0baa28f (diff) | |
| parent | 6e754551254a8cc64e034163f5d0dc155b450388 (diff) | |
| download | rails-5abe63c419de22cb1b95334d8741a32cd175a0d7.tar.gz rails-5abe63c419de22cb1b95334d8741a32cd175a0d7.tar.bz2 rails-5abe63c419de22cb1b95334d8741a32cd175a0d7.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/response.rb
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_controller/url_rewriter.rb
activerecord/lib/active_record/associations.rb
activesupport/lib/active_support/core_ext/time/conversions.rb
railties/doc/guides/creating_plugins/acts_as_yaffle.txt
railties/doc/guides/creating_plugins/creating_plugins.txt
railties/doc/guides/creating_plugins/migration_generator.txt
railties/doc/guides/creating_plugins/odds_and_ends.txt
railties/doc/guides/creating_plugins/preparation.txt
railties/doc/guides/creating_plugins/string_to_squawk.txt
railties/doc/guides/creating_plugins/view_helper.txt
railties/doc/guides/securing_rails_applications/creating_records_directly_from_form_parameters.txt
railties/doc/guides/testing_rails_applications/testing_rails_applications.txt
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions