Commit Graph

4 Commits

Author SHA1 Message Date
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
woutervanwijk
99ab2dbfb8 make reboot/update work with mopidy-websettings 2014-09-22 00:16:25 +02:00
woutervanwijk
e069b98706 Merge branch 'develop' 2014-09-19 23:41:12 +02:00
woutervanwijk
b39530e882 merged #37 2014-09-19 00:59:45 +02:00