aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource/observing.rb
diff options
context:
space:
mode:
authorJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-25 09:50:01 +1100
committerJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-25 09:50:01 +1100
commit4e96442c4e404141830b2d7f0d850b6556190b39 (patch)
treea3ca088ad9d68b5be9ace4d431375bb3fd4ea045 /activeresource/lib/active_resource/observing.rb
parenta74a655648618a6ed568b9b4ef3a17a8970e7774 (diff)
parent396003fc48d7c0ba206ad059646c7414bee22a36 (diff)
downloadrails-4e96442c4e404141830b2d7f0d850b6556190b39.tar.gz
rails-4e96442c4e404141830b2d7f0d850b6556190b39.tar.bz2
rails-4e96442c4e404141830b2d7f0d850b6556190b39.zip
Merge branch 'master' of git://github.com/rails/rails
Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb
Diffstat (limited to 'activeresource/lib/active_resource/observing.rb')
0 files changed, 0 insertions, 0 deletions