diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 05:24:16 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 05:24:16 -0700 |
commit | 2a27485c68aba36c33897ae96f15fda9abb5a6a4 (patch) | |
tree | 383bf91af3ebf601509123f7e0b850144e0a2143 /actionpack/lib/action_controller/metal/flash.rb | |
parent | a18c9f07fc1f4952d48e4f0473a3f14909068c62 (diff) | |
parent | 187969069a1d76b93088ec8f574b8c80252dbb51 (diff) | |
download | rails-2a27485c68aba36c33897ae96f15fda9abb5a6a4.tar.gz rails-2a27485c68aba36c33897ae96f15fda9abb5a6a4.tar.bz2 rails-2a27485c68aba36c33897ae96f15fda9abb5a6a4.zip |
Merge pull request #10041 from vipulnsward/more_destructive_merge
change merge to merge! in AS on new hashes
Diffstat (limited to 'actionpack/lib/action_controller/metal/flash.rb')
0 files changed, 0 insertions, 0 deletions