diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
commit | 8494003ebf71ef437dfccb9374366a51ecb5924c (patch) | |
tree | 88f105ebb3ebdd84b64b4b5cb5f00db5cacd9e2d /config/environment.rb | |
parent | fbfebdbe1c5b13f86f92404c3397d6dcb75766ce (diff) | |
parent | b7075181100852ff2117d61b02881e84deaafa87 (diff) |
Merge remote-tracking branch 'jpmckinney/pre1.9' into develop
Conflicts:
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'config/environment.rb')
-rw-r--r-- | config/environment.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb index 91839c043..7c0662d3a 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -134,6 +134,7 @@ I18n.available_locales = available_locales.map {|locale_name| locale_name.to_sym I18n.default_locale = default_locale # Load monkey patches and other things from lib/ +require 'ruby19.rb' require 'tmail_extensions.rb' require 'activesupport_cache_extensions.rb' require 'timezone_fixes.rb' |