c32992c21b
Conflicts: Rakefile couchrest_model.gemspec history.txt lib/couchrest_model.rb spec/couchrest/attribute_protection_spec.rb |
||
---|---|---|
.. | ||
couchrest | ||
fixtures | ||
.gitignore | ||
spec_helper.rb |
c32992c21b
Conflicts: Rakefile couchrest_model.gemspec history.txt lib/couchrest_model.rb spec/couchrest/attribute_protection_spec.rb |
||
---|---|---|
.. | ||
couchrest | ||
fixtures | ||
.gitignore | ||
spec_helper.rb |