jyapayne/mongoengine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'listfield' into dev

Browse source 
Conflicts:
	docs/changelog.rst
This commit is contained in:
Ross Lawley 2011-10-04 04:28:04 -07:00
commit aedcf3dc81
4 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/changelog.rst
View file

@ -5,7 +5,11 @@ Changelog
Changes in dev
==============
<<<<<<< HEAD
- Added spec file for rpm-based distributions
=======
- Updated ComplexFields so if required they won't accept empty lists / dicts
>>>>>>> listfield
- Fixed ListField so it doesnt accept strings
- Added DynamicDocument and EmbeddedDynamicDocument classes for expando schemas