This project is archived and is in readonly mode.

Changeset [13f7f89bda503ccb1abc8dc78fbe36c44d902c49] by Xavier Noria

October 14th, 2010 @ 10:15 PM

Merge branch 'master' of git://github.com/lifo/docrails
http://github.com/rails/rails/commit/13f7f89bda503ccb1abc8dc78fbe36...

Committed by Xavier Noria

  • M actionpack/lib/action_controller/metal/conditional_get.rb
  • M activerecord/lib/active_record/callbacks.rb
  • M activesupport/lib/active_support/core_ext/time/conversions.rb
  • M railties/guides/source/association_basics.textile
  • M railties/guides/source/command_line.textile

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>