Jens Lütjen 5057b8b31d Merge 'develop' and resolve conflict ... Conflicts: docs/changelog.rst		2016-09-14 18:17:52 +02:00
..
test_fields.py	Merge 'develop' and resolve conflict	2016-09-14 18:17:52 +02:00
test_legacy.py	models: Add ValidatedImmutableObject and "revert" ImmutableObject	2015-05-04 23:41:11 +02:00
test_models.py	New CoreState to hold all core states	2016-01-10 13:24:14 +01:00