aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/autoload.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-09-21 12:05:28 -0700
committerYehuda Katz <wycats@gmail.com>2009-09-21 12:05:28 -0700
commit1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50 (patch)
tree36201d3efb5af8ae5ec1898fd6f3b8b366227819 /activesupport/lib/active_support/autoload.rb
parente2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff)
parent4215e9ab936efca915ca998273d2fc0c46bb59b8 (diff)
downloadrails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.gz
rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.bz2
rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.zip
Merge commit 'jose/orchestra'
Diffstat (limited to 'activesupport/lib/active_support/autoload.rb')
-rw-r--r--activesupport/lib/active_support/autoload.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
index 75706855d6..423d5448c3 100644
--- a/activesupport/lib/active_support/autoload.rb
+++ b/activesupport/lib/active_support/autoload.rb
@@ -17,6 +17,7 @@ module ActiveSupport
autoload :Multibyte, 'active_support/multibyte'
autoload :NewCallbacks, 'active_support/new_callbacks'
autoload :OptionMerger, 'active_support/option_merger'
+ autoload :Orchestra, 'active_support/orchestra'
autoload :OrderedHash, 'active_support/ordered_hash'
autoload :OrderedOptions, 'active_support/ordered_options'
autoload :Rescuable, 'active_support/rescuable'