Jens Lütjen 5057b8b31d Merge 'develop' and resolve conflict ... Conflicts: docs/changelog.rst		2016-09-14 18:17:52 +02:00
..
__init__.py	model documentation: update 'composers' and 'performers' type	2016-05-28 04:57:32 +02:00
fields.py	Merge 'develop' and resolve conflict	2016-09-14 18:17:52 +02:00
immutable.py	Register mopidy models for deserialization.	2016-03-06 12:42:13 +01:00
serialize.py	Register mopidy models for deserialization.	2016-03-06 12:42:13 +01:00