Fix merge in docs/changelog.rst
This commit is contained in:
parent
5583cf0a5f
commit
eac4f6062e
@ -5,13 +5,10 @@ Changelog
|
||||
|
||||
Changes in 0.9.X - DEV
|
||||
======================
|
||||
<<<<<<< HEAD
|
||||
- OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771
|
||||
- with_limit_and_skip for count should default like in pymongo #759
|
||||
- Fix storing value of precision attribute in DecimalField #787
|
||||
=======
|
||||
- Set attribute to None does not work (at least for fields with default values) #734
|
||||
>>>>>>> bdbd495a9e778d12157b789a74e0e00a303b5efd
|
||||
- Querying by a field defined in a subclass raises InvalidQueryError #744
|
||||
- Add Support For MongoDB 2.6.X's maxTimeMS #778
|
||||
- abstract shouldn't be inherited in EmbeddedDocument # 789
|
||||
|
Loading…
x
Reference in New Issue
Block a user