Merge branch 'master' into 0.8

Conflicts:
	docs/changelog.rst
	mongoengine/__init__.py
This commit is contained in:
Ross Lawley
2012-11-06 14:28:55 +00:00
2 changed files with 2 additions and 3 deletions

View File

@@ -7,8 +7,7 @@ Changes in 0.8
- Inheritance is off by default (MongoEngine/mongoengine#122)
- Remove _types and just use _cls for inheritance (MongoEngine/mongoengine#148)
Changes in 0.7.X
Changes in 0.7.6
================
- Unicode fix for repr (MongoEngine/mongoengine#133)
- Allow updates with match operators (MongoEngine/mongoengine#144)