Ross Lawley 04b85ddbf2 Merge branch 'master' into 0.8 ... Conflicts: .travis.yml AUTHORS docs/changelog.rst mongoengine/base.py mongoengine/queryset.py tests/queryset/queryset.py		2013-04-12 13:36:29 +00:00
..
_themes/nature	Added API Reference to docs	2009-12-19 16:04:05 +00:00
code	Added docs directory, started tutorial	2009-11-22 23:26:21 +00:00
guide	Undefined data should not override instance methods (#49)	2013-01-25 11:28:20 +00:00
apireference.rst	Added no_dereference context manager (#82)	2013-01-23 19:05:44 +00:00
changelog.rst	Merge branch 'master' into 0.8	2013-04-12 13:36:29 +00:00
conf.py	Fix doc generation path (#230)	2013-04-11 13:15:17 +00:00
django.rst	Added support for compound primary keys (#149)	2013-01-24 10:37:54 +00:00
index.rst	Update docs/index.rst	2012-09-11 12:38:40 +03:00
Makefile	Added API Reference to docs	2009-12-19 16:04:05 +00:00
tutorial.rst	Documentation fixes	2013-01-24 17:43:57 +00:00
upgrade.rst	Added the "get_decoded" method to the MongoSession class (#216)	2013-01-28 14:12:47 +00:00