aboutsummaryrefslogtreecommitdiffstats
path: root/config/environment.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-11-24 12:46:48 +0000
committerSeb Bacon <seb.bacon@gmail.com>2011-11-24 12:46:48 +0000
commit76168e23fd78d276a197cc992bb6ef5a065f6f3f (patch)
treef15093086b2ff767968e6bbd1b816c66f35bd5dd /config/environment.rb
parentfb2b20037bb176533de4e7fa86701248473f8ee3 (diff)
parent589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (diff)
Merge branch 'develop' into xapian-dcabo
Conflicts: spec/models/xapian_spec.rb
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb1
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'