jyapayne/mongoengine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mallard/master' into 0.9

Browse source 
Conflicts:
	AUTHORS
	mongoengine/document.py
This commit is contained in:
Ross Lawley 2013-07-10 08:14:39 +00:00
commit 061cee83a8
33 changed files with 1117 additions and 1119 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AUTHORS
View file

@ -9,6 +9,7 @@ Steve Challis <steve@stevechallis.com>
Wilson Júnior <wilsonpjunior@gmail.com>
Dan Crosta https://github.com/dcrosta
Laine Herron https://github.com/LaineHerron
Thomas Steinacher http://thomasst.ch/
CONTRIBUTORS
@ -114,7 +115,6 @@ that much better:
* Alexander Koshelev
* Jaime Irurzun
* Alexandre González
* Thomas Steinacher
* Tommi Komulainen
* Peter Landry
* biszkoptwielki
@ -170,4 +170,4 @@ that much better:
* Nigel McNie (https://github.com/nigelmcnie)
* ygbourhis (https://github.com/ygbourhis)
* Bob Dickinson (https://github.com/BobDickinson)
* Michael Bartnett (https://github.com/michaelbartnett)
* Michael Bartnett (https://github.com/michaelbartnett)