mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge branch 'master' of github.com:rails/rails
This commit is contained in:
commit
3a066e81b3
1 changed files with 1 additions and 2 deletions
|
@ -67,8 +67,7 @@ module ActionController
|
|||
@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
|
||||
|
|
Loading…
Reference in a new issue