diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-06-12 16:20:27 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-06-12 16:20:27 -0300 |
commit | a924b2f66e955dcc82b691ca5e48ef5b84035286 (patch) | |
tree | 8ea40389c9cae3568652a17d6892169179eb8bad /activerecord/lib/active_record.rb | |
parent | 247ac954132222fdd399cddc264bc1d4029f750c (diff) | |
parent | 8f7c657f4b1c037348b24f0b9dd1e45099fbc760 (diff) | |
download | rails-a924b2f66e955dcc82b691ca5e48ef5b84035286.tar.gz rails-a924b2f66e955dcc82b691ca5e48ef5b84035286.tar.bz2 rails-a924b2f66e955dcc82b691ca5e48ef5b84035286.zip |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record.rb')
-rw-r--r-- | activerecord/lib/active_record.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 36adc7b6f2..3b8b9826fe 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -63,7 +63,7 @@ module ActiveRecord autoload :Migrator, 'active_record/migration' autoload :NamedScope, 'active_record/named_scope' autoload :NestedAttributes, 'active_record/nested_attributes' - autoload :Observing, 'active_record/observer' + autoload :Observer, 'active_record/observer' autoload :QueryCache, 'active_record/query_cache' autoload :Reflection, 'active_record/reflection' autoload :Schema, 'active_record/schema' |