diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-08-04 15:18:35 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-08-04 15:18:35 +0530 |
| commit | 3d3fa165e40c8cdaaebdab9dd2985d0ca3a36236 (patch) | |
| tree | 21ae9b984d34c9487628097f3933f8fa14a3558f /actionpack/lib/action_controller/metal/cookies.rb | |
| parent | c963f883a41913624363bfd8203b5640318198c2 (diff) | |
| parent | b51201242aaf77c6db5a9b2f72e433c521df79c5 (diff) | |
| download | rails-3d3fa165e40c8cdaaebdab9dd2985d0ca3a36236.tar.gz rails-3d3fa165e40c8cdaaebdab9dd2985d0ca3a36236.tar.bz2 rails-3d3fa165e40c8cdaaebdab9dd2985d0ca3a36236.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activemodel/lib/active_model/secure_password.rb
activerecord/lib/active_record/associations/collection_proxy.rb
Diffstat (limited to 'actionpack/lib/action_controller/metal/cookies.rb')
0 files changed, 0 insertions, 0 deletions