diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-14 12:34:38 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-14 12:34:38 -0300 |
| commit | 48c1e6d584409d774b184e0f4d2ef28e5b0e9c90 (patch) | |
| tree | a2becf0cce37a47579e848780b02f420d335ccd9 /activemodel/lib/active_model.rb | |
| parent | 9ac01fad193b27e517ea772e0d1e13e06f4ddf34 (diff) | |
| parent | c6bc8e662614be711f45a8d4b231d5f993b024a7 (diff) | |
| download | rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.tar.gz rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.tar.bz2 rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activemodel/lib/active_model.rb')
| -rw-r--r-- | activemodel/lib/active_model.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index b24a929ff5..244f3a546e 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -35,7 +35,7 @@ module ActiveModel autoload :Naming, 'active_model/naming' autoload :Observer, 'active_model/observing' autoload :Observing, 'active_model/observing' - autoload :Serializer, 'active_model/serializer' + autoload :Serialization, 'active_model/serialization' autoload :StateMachine, 'active_model/state_machine' autoload :TestCase, 'active_model/test_case' autoload :Validations, 'active_model/validations' |