diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-05-13 11:08:10 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-05-13 11:08:10 +0200 |
| commit | 15354b6fd0e73a321b695ac3961eac8df9d6125d (patch) | |
| tree | e7965a8841a18cc706e8a8b7e207f377acf7f690 /activerecord/lib/active_record/no_touching.rb | |
| parent | 6eaa5b17a094e5cbbdedad578e8bb2f5ae187aac (diff) | |
| parent | cbd66b430b6553e468bcdaa94af661a2d8b69d81 (diff) | |
| download | rails-15354b6fd0e73a321b695ac3961eac8df9d6125d.tar.gz rails-15354b6fd0e73a321b695ac3961eac8df9d6125d.tar.bz2 rails-15354b6fd0e73a321b695ac3961eac8df9d6125d.zip | |
Merge branch 'sti-subclass-from-attributes' of https://github.com/agrobbin/rails into agrobbin-sti-subclass-from-attributes
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/no_touching.rb')
0 files changed, 0 insertions, 0 deletions