Merge branch 'master' into 0.7
Conflicts: mongoengine/base.py
This commit is contained in:
commit
52d80ac23c
12 changed files with 163 additions and 53 deletions
3
AUTHORS
3
AUTHORS
|
|
@ -115,4 +115,5 @@ that much better:
|
|||
* Jaime Irurzun
|
||||
* Alexandre González
|
||||
* Thomas Steinacher
|
||||
* Tommi Komulainen
|
||||
* Tommi Komulainen
|
||||
* Peter Landry
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue