diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
| commit | 2fbf302149cf40c791ca1207a5f984cf58903397 (patch) | |
| tree | 5da770d0fd31520a6264a9864b1db1412646d100 /activerecord/test/cases/mixin_test.rb | |
| parent | a0656989c47c29c87c4f243ce3695c39777c67b8 (diff) | |
| parent | b84b759ec60b5005fea183186639408fcf903450 (diff) | |
| download | rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.gz rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.bz2 rails-2fbf302149cf40c791ca1207a5f984cf58903397.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
railties/guides/source/contributing_to_ruby_on_rails.textile
Diffstat (limited to 'activerecord/test/cases/mixin_test.rb')
0 files changed, 0 insertions, 0 deletions