31b52ba012
Conflicts: lib/couchrest/model/base.rb |
||
---|---|---|
.. | ||
fixtures | ||
functional | ||
unit | ||
.gitignore | ||
spec_helper.rb |
31b52ba012
Conflicts: lib/couchrest/model/base.rb |
||
---|---|---|
.. | ||
fixtures | ||
functional | ||
unit | ||
.gitignore | ||
spec_helper.rb |