diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-19 14:29:14 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-19 14:29:14 +0000 |
| commit | 19939fd4c0d0e4eae4ec71df13228547dba03287 (patch) | |
| tree | 79de6effe9874f3d17eada3666c13b5f76fa537c /railties | |
| parent | 2d78ee0de632010c2f4a8ca370b4752959693e21 (diff) | |
| parent | c3f53f412cd170fc295b46e48aa81837ad15ec83 (diff) | |
| download | rails-19939fd4c0d0e4eae4ec71df13228547dba03287.tar.gz rails-19939fd4c0d0e4eae4ec71df13228547dba03287.tar.bz2 rails-19939fd4c0d0e4eae4ec71df13228547dba03287.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
Diffstat (limited to 'railties')
0 files changed, 0 insertions, 0 deletions