Merge branch 'master' of github.com:couchrest/couchrest_model

This commit is contained in:
Sam Lown 2010-12-02 22:08:47 +01:00
commit fd0f8c7d95
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View file

@ -5,3 +5,4 @@ pkg
Gemfile* Gemfile*
.rvmrc .rvmrc
.bundle .bundle
couchdb.std*

View file

@ -1 +1 @@
require File.join(File.dirname(__FILE__),'lib', 'couchrest', 'extended_document') require File.join(File.dirname(__FILE__),'lib', 'couchrest', 'model')