1bced3b207
Conflicts: .gitignore lib/couchrest/model/base.rb lib/couchrest/model/configuration.rb lib/couchrest_model.rb |
||
---|---|---|
.. | ||
model | ||
model.rb | ||
railtie.rb |
1bced3b207
Conflicts: .gitignore lib/couchrest/model/base.rb lib/couchrest/model/configuration.rb lib/couchrest_model.rb |
||
---|---|---|
.. | ||
model | ||
model.rb | ||
railtie.rb |