diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-03-27 16:15:11 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-03-27 16:15:11 -0700 |
commit | da5f65676e4e6f9ac38a3bd0003cf3b1308ff0ea (patch) | |
tree | edd0cf871e86294dfbe12afe1f45c166e3501b3a /actionpack/lib/action_controller/caching/pages.rb | |
parent | 33164c8f1479b826a044ab90f4cc2439666e4b16 (diff) | |
parent | 32763a82444ba5eb711ec0e5d6380818e5f2695d (diff) | |
download | rails-da5f65676e4e6f9ac38a3bd0003cf3b1308ff0ea.tar.gz rails-da5f65676e4e6f9ac38a3bd0003cf3b1308ff0ea.tar.bz2 rails-da5f65676e4e6f9ac38a3bd0003cf3b1308ff0ea.zip |
Merge pull request #5621 from rafaelfranca/fix-2492-master
Fix label_tag to merge the options hash with the object hash
Diffstat (limited to 'actionpack/lib/action_controller/caching/pages.rb')
0 files changed, 0 insertions, 0 deletions