7e054fd948
Conflicts: history.md lib/couchrest/model/property.rb |
||
---|---|---|
.. | ||
couchrest | ||
rails/generators | ||
couchrest_model.rb |
7e054fd948
Conflicts: history.md lib/couchrest/model/property.rb |
||
---|---|---|
.. | ||
couchrest | ||
rails/generators | ||
couchrest_model.rb |