aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-03-05 22:51:48 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-03-05 22:51:48 +0530
commit6ea48ebfa68947ad66a516bdb7452e0faf3f70a7 (patch)
tree419238b9e32ec58b35d424d808d507d1c7f063d7 /activemodel
parent588f267e71083928ee8b6375a444fb674dad8fcf (diff)
parentb9b609e00d534b7203a443205e1db7ec9a3ddba8 (diff)
downloadrails-6ea48ebfa68947ad66a516bdb7452e0faf3f70a7.tar.gz
rails-6ea48ebfa68947ad66a516bdb7452e0faf3f70a7.tar.bz2
rails-6ea48ebfa68947ad66a516bdb7452e0faf3f70a7.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/conversion.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 1f5d23dd8e..21e4eb3c86 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -1,5 +1,5 @@
module ActiveModel
- # == Active \Model Conversions
+ # == Active \Model Conversion
#
# Handles default conversions: to_model, to_key, to_param, and to_partial_path.
#