Skip to content
Browse files

Merge branch 'master' of github.com:rails/rails

  • Loading branch information...
2 parents 4aac5fd + 71375c8 commit 3a066e81b34fbad93edce1776354f879f30ce4e8 @dhh dhh committed Jun 2, 2010
Showing with 1 addition and 2 deletions.
  1. +1 −2 actionpack/lib/action_controller/base.rb
View
3 actionpack/lib/action_controller/base.rb
@@ -67,8 +67,7 @@ def self.subclasses
@subclasses ||= []
end
- # TODO Move this to the appropriate module
- config_accessor :asset_path
+ config_accessor :asset_host, :asset_path
ActiveSupport.run_load_hooks(:action_controller, self)
end

0 comments on commit 3a066e8

Please sign in to comment.
Something went wrong with that request. Please try again.