diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-21 18:49:19 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-21 18:49:19 +0530 |
commit | f938019da210ea2bfccabdf61424852e8006c741 (patch) | |
tree | 7cd316340f230efe5b2d55b7df5a85232e5d5db5 /activemodel/lib/active_model/naming.rb | |
parent | cec66e589f69a10ab9d6e4b62dd34ff09e5dc01b (diff) | |
parent | e84281398e79e09b637c888860fcefd6f82bf968 (diff) | |
download | rails-f938019da210ea2bfccabdf61424852e8006c741.tar.gz rails-f938019da210ea2bfccabdf61424852e8006c741.tar.bz2 rails-f938019da210ea2bfccabdf61424852e8006c741.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/core_ext/hash/slice.rb
guides/source/active_support_core_extensions.md
Diffstat (limited to 'activemodel/lib/active_model/naming.rb')
-rw-r--r-- | activemodel/lib/active_model/naming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb index c0d93e5d53..eb8265d8c6 100644 --- a/activemodel/lib/active_model/naming.rb +++ b/activemodel/lib/active_model/naming.rb @@ -195,7 +195,7 @@ module ActiveModel end end - # == Active Model Naming + # == Active \Model \Naming # # Creates a +model_name+ method on your object. # |