diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-16 11:57:03 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-16 11:57:03 -0800 |
| commit | 060fbd6a88332ae5e3d8b9cf3d20559544b08693 (patch) | |
| tree | 44d1076686961ae48a86ed9a8a51054438fb2da1 /activerecord/test/fixtures/memberships.yml | |
| parent | f19ba681a80c0b0be604c58389ce2892c623d027 (diff) | |
| parent | 44c51fc9cc7a0cdcf8b657e1900eb141083ef683 (diff) | |
| download | rails-060fbd6a88332ae5e3d8b9cf3d20559544b08693.tar.gz rails-060fbd6a88332ae5e3d8b9cf3d20559544b08693.tar.bz2 rails-060fbd6a88332ae5e3d8b9cf3d20559544b08693.zip | |
Merge branch 'master' into adequaterecord
* master:
define the delegate methods on one line. fixes #13724
Diffstat (limited to 'activerecord/test/fixtures/memberships.yml')
0 files changed, 0 insertions, 0 deletions