diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-30 23:15:22 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-30 23:15:22 +0530 |
| commit | 6b9d1a0db2f7829509689d244d6a5eda5210401d (patch) | |
| tree | 2d4920fa5e2f3d8571573d5aee717cac261c53ac /activerecord/lib/active_record/connection_adapters | |
| parent | 4662c5f4effd829099d647a7a76c7044fcc68121 (diff) | |
| parent | 32c28e8214940fe6b06043b280e8d342e16eb3c6 (diff) | |
| download | rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.gz rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.bz2 rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activemodel/lib/active_model/errors.rb
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
0 files changed, 0 insertions, 0 deletions