diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 09:50:42 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 09:50:42 -0700 |
commit | 31e3033ed9059577e60a8e25962f55bc4a918fd7 (patch) | |
tree | e3e6e6a143a87d97c44994b540527c85127f023d /lib | |
parent | e75f0e5ae5dd225fe44bd3f6c582f86e18d91ceb (diff) | |
parent | a4f5ccfe579a3ec74e1811117e887ffbea260e9b (diff) | |
download | rails-31e3033ed9059577e60a8e25962f55bc4a918fd7.tar.gz rails-31e3033ed9059577e60a8e25962f55bc4a918fd7.tar.bz2 rails-31e3033ed9059577e60a8e25962f55bc4a918fd7.zip |
Merge remote branch 'krek/fake_record_adapter'
* krek/fake_record_adapter:
'sqlite3' ==> {:adapter => 'sqlite3'}
Conflicts:
spec/support/fake_record.rb
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions