diff options
author | José Valim <jose.valim@gmail.com> | 2011-10-05 02:17:29 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-10-05 02:35:43 +0200 |
commit | 87c57bb88f0eb1462ed31733ebcf3d9a535d8f16 (patch) | |
tree | b1ec2f62e4629d7bf3d5fdfa5483055f5eca6989 /activesupport/lib/active_support/option_merger.rb | |
parent | ee2be435b1e5c0e94a4ee93a1a310e0471a77d07 (diff) | |
download | rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.tar.gz rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.tar.bz2 rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.zip |
Fix the lame config.action_controller.present? check scattered throughout assets_path.
Conflicts:
actionpack/test/template/sprockets_helper_test.rb
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
0 files changed, 0 insertions, 0 deletions