diff options
author | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
commit | 4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5 (patch) | |
tree | 6f080f704435d22dbfee6ffd454529c12e5bb505 /actionpack/lib/abstract_controller.rb | |
parent | 7b622786fcc5046a06989ec7a3cbf46f92e04dea (diff) | |
parent | 84f6da45a19d335be320991cab44f492f61dc5c7 (diff) | |
download | rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.gz rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.bz2 rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/abstract_controller.rb')
-rw-r--r-- | actionpack/lib/abstract_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 7028cd0379..2da4dc052c 100644 --- a/actionpack/lib/abstract_controller.rb +++ b/actionpack/lib/abstract_controller.rb @@ -7,6 +7,7 @@ require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/module/attr_internal' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/module/anonymous' +require 'active_support/i18n' module AbstractController extend ActiveSupport::Autoload |