Ross Lawley 51e50bf0a9 Merge branch 'master' into 0.8M ...

Conflicts:
	AUTHORS
	docs/django.rst
	mongoengine/base.py
	mongoengine/queryset.py
	tests/fields/fields.py
	tests/queryset/queryset.py
	tests/test_dereference.py
	tests/test_document.py

2013-04-17 11:57:53 +00:00

..

__init__.py

Undefined data should not override instance methods (#49)

2013-01-25 11:28:20 +00:00

class_methods.py

Updated tests

2013-01-28 13:40:28 +00:00

delta.py

Inheritance is off by default (MongoEngine/mongoengine#122)

2012-10-22 19:29:26 +00:00

dynamic.py

Updated tests

2013-01-28 13:40:28 +00:00

indexes.py

Updated tests

2013-01-28 13:40:28 +00:00

inheritance.py

Updated tests

2013-01-28 13:40:28 +00:00

instance.py

Merge branch 'master' into 0.8M

2013-04-17 11:57:53 +00:00

json_serialisation.py

Added json serialisation support

2012-11-08 12:04:14 +00:00

validation.py

Merge branch 'master' into 0.8M

2013-04-17 11:57:53 +00:00