woutervanwijk b82a956c52 Merge branch 'develop' ... Conflicts: README.rst mopidy_musicbox_webclient/static/css/webclient.css mopidy_musicbox_webclient/static/index.html		2014-11-24 22:24:39 +01:00
..
css	Merge branch 'develop'	2014-11-24 22:24:39 +01:00
images	merged #37	2014-09-19 00:59:45 +02:00
js	Merge branch 'develop'	2014-11-24 22:24:39 +01:00
dialog-success.html	merged #37	2014-09-19 00:59:45 +02:00
index.html	Merge branch 'develop'	2014-11-24 22:24:39 +01:00
mb.manifest	merged #37	2014-09-19 00:59:45 +02:00
system.html	merged #37	2014-09-19 00:59:45 +02:00