Ross Lawley a68529fba8 Merge branch 'master' into 0.8 ...

Conflicts:
	tests/test_document.py

2013-01-09 13:36:17 +00:00

..

__init__.py

Added json serialisation support

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

class_methods.py

Merge branch 'master' into 0.8

2013-01-09 13:36:17 +00:00

delta.py

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

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

dynamic.py

Fixing for python2.5

2012-12-19 12:51:42 +00:00

indexes.py

Merge branch 'master' into 0.8

2013-01-09 13:36:17 +00:00

inheritance.py

Merge branch 'master' into 0.8

2013-01-09 13:36:17 +00:00

instance.py

Whitespace

2013-01-04 16:28:26 +00:00

json_serialisation.py

Added json serialisation support

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