diff options
author | Abdelkader Boudih <terminale@gmail.com> | 2014-11-27 18:21:43 +0000 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-27 16:26:02 -0200 |
commit | 2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13 (patch) | |
tree | 015e8cb7ccefb5fe98361a0ff501d4719aec2d2b /activerecord/test/models/admin.rb | |
parent | dd4203cfaf8ef8f006b26542aa329b5b721701de (diff) | |
download | rails-2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13.tar.gz rails-2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13.tar.bz2 rails-2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13.zip |
Merge pull request #17803 from sadfuzzy/patch-2
Update cookies.rb
Conflicts:
actionpack/lib/action_dispatch/middleware/cookies.rb
Diffstat (limited to 'activerecord/test/models/admin.rb')
0 files changed, 0 insertions, 0 deletions