This project is archived and is in readonly mode.
Changeset [3805d01c9b0ee6681d3e36233a82731200b87d34] by Xavier Noria
August 30th, 2010 @ 11:24 PM
resolves merge conflict
http://github.com/rails/rails/commit/3805d01c9b0ee6681d3e36233a8273...
Committed by Xavier Noria
- M actionpack/lib/action_dispatch/http/response.rb
- M actionpack/lib/action_dispatch/routing.rb
- M actionpack/lib/action_dispatch/routing/mapper.rb
- M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
- M actionpack/lib/action_dispatch/routing/url_for.rb
- M actionpack/lib/action_dispatch/testing/assertions/selector.rb
- M actionpack/lib/action_dispatch/testing/integration.rb
- M activerecord/lib/active_record/persistence.rb
- M railties/guides/source/3_0_release_notes.textile
- M railties/guides/source/active_record_querying.textile
- M railties/guides/source/caching_with_rails.textile
- M railties/guides/source/getting_started.textile
- M railties/guides/source/initialization.textile
- M railties/lib/rails/generators/rails/app/templates/README
- M railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
<h2 style="font-size: 14px">Tickets have moved to Github</h2>
The new ticket tracker is available at <a href="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>