Fixed changelog

This commit is contained in:
Ross Lawley 2011-10-04 04:28:30 -07:00
parent aedcf3dc81
commit dca135190a

View File

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