Commit Graph

1 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