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 DummyAudio into tests package	2015-02-13 10:40:21 +01:00
actor.py	flake8: Fix new import order warnings	2015-04-12 23:05:53 +02:00
constants.py	autopep8: Add space after class signature/docstring	2015-04-03 00:05:26 +02:00
listener.py	autopep8: Add space after class signature/docstring	2015-04-03 00:05:26 +02:00
playlists.py	autopep8: Add space after class signature/docstring	2015-04-03 00:05:26 +02:00
scan.py	Merge branch 'v1.0.x' into develop	2015-04-13 08:19:14 +02:00
utils.py	audio: Add proxy support to scanner	2015-02-13 00:51:52 +01:00