diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-17 10:00:33 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-17 10:29:28 -0800 |
| commit | 649f2513a453cae319be8b63a9de25ae11fb9e8f (patch) | |
| tree | e82ffb4cdfa682083d5ef6b28248f6d81f3cfe41 /activesupport/lib/active_support/option_merger.rb | |
| parent | d8b2b6a183020aaaacb901dd78ec2b901b119a0d (diff) | |
| download | rails-649f2513a453cae319be8b63a9de25ae11fb9e8f.tar.gz rails-649f2513a453cae319be8b63a9de25ae11fb9e8f.tar.bz2 rails-649f2513a453cae319be8b63a9de25ae11fb9e8f.zip | |
Revert "Merge pull request #3603 from vijaydev/change_table_without_block_arg"
This reverts commit 81fad6a270ec3cbbb88553c9f2e8200c34fd4d13, reversing
changes made to 23101de283de13517e30c4c3d1ecc65525264886.
Conflicts:
activerecord/test/cases/migration_test.rb
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
0 files changed, 0 insertions, 0 deletions