Commit Graph

4 Commits

Author SHA1 Message Date
woutervanwijk
efad0a5020 repaired github commit 2014-11-24 22:42:37 +01:00
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
aa867288d8 smaller icons 2014-09-27 11:17:22 +02:00
woutervanwijk
b39530e882 merged #37 2014-09-19 00:59:45 +02:00