aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support.rb')
-rw-r--r--activesupport/lib/active_support.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 7d5440f2a8..1cace11e9b 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -32,5 +32,6 @@ require 'active_support/clean_logger'
require 'active_support/dependencies'
require 'active_support/ordered_options'
+require 'active_support/option_merger'
require 'active_support/values/time_zone' \ No newline at end of file