diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:48:47 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:48:47 +0200 |
| commit | 00e1d0832e1242fe41cf43490b0a3a21a40f3c26 (patch) | |
| tree | 06d3fcf35727a37f78885fc63fe15ff265aa309a /activemodel/lib/active_model/serialization.rb | |
| parent | d25b7c2eeefff3a0abf7b532c10ce25a71d0fba2 (diff) | |
| parent | 03f418370a4266e414ff32706381bb2b60baadfc (diff) | |
| download | rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.gz rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.bz2 rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
actionmailer/lib/action_mailer/base.rb
activesupport/lib/active_support/core_ext/kernel/requires.rb
Diffstat (limited to 'activemodel/lib/active_model/serialization.rb')
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index caf44a2ee0..4a174cb62a 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -31,7 +31,7 @@ module ActiveModel # you want to serialize and their current value. # # Most of the time though, you will want to include the JSON or XML - # serializations. Both of these modules automatically include the + # serializations. Both of these modules automatically include the # ActiveModel::Serialization module, so there is no need to explicitly # include it. # |