diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-19 08:28:57 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-19 08:28:57 -0700 |
| commit | 1dbf1c80ac4693634f536b410e7d4910cc2e173f (patch) | |
| tree | 687385bd46b8a6d0761ea35fc82e9e6417c5eccb /guides/source/layouts_and_rendering.textile | |
| parent | f9fc26e8007d5e2936cf5374a8168b2c37273490 (diff) | |
| parent | bf80522be4d7ac521fa3c30d889afa68450a0bc2 (diff) | |
| download | rails-1dbf1c80ac4693634f536b410e7d4910cc2e173f.tar.gz rails-1dbf1c80ac4693634f536b410e7d4910cc2e173f.tar.bz2 rails-1dbf1c80ac4693634f536b410e7d4910cc2e173f.zip | |
Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-merge
Fix "last equality wins" logic in relation merge
Diffstat (limited to 'guides/source/layouts_and_rendering.textile')
0 files changed, 0 insertions, 0 deletions