Stein Magnus Jodal 093c4340cd Merge branch 'v1.0.x' into develop ... Conflicts: mopidy/audio/scan.py tests/audio/test_scan.py		2015-04-13 08:19:14 +02:00
..
__init__.py	audio: Move tests to make room for more audio tests	2012-11-13 20:26:05 +01:00
test_actor.py	flake8: Fix new import order warnings	2015-04-12 23:05:53 +02:00
test_listener.py	autopep8: Add space after class signature/docstring	2015-04-03 00:05:26 +02:00
test_playlists.py	autopep8: Add space after class signature/docstring	2015-04-03 00:05:26 +02:00
test_scan.py	Merge branch 'v1.0.x' into develop	2015-04-13 08:19:14 +02:00
test_utils.py	autopep8: Add space after class signature/docstring	2015-04-03 00:05:26 +02:00