Merge branch 'master' into filter
authorDaniel Schregenberger <daniel@despite.ch>
Fri, 11 May 2018 14:59:07 +0000 (16:59 +0200)
committerGitHub <noreply@github.com>
Fri, 11 May 2018 14:59:07 +0000 (16:59 +0200)
commit3774a35f4cd434cace98d7a1585a0262421a2e7b
tree1a66bc7729ba3d483b872f495b5740220c5cbd7c
parent61ad51ffb7c33f2a76e1c7f34bfe2747b8bd8017
parent1e96a921c54a52a3176d9e84d49d3f3efc5e0d98
Merge branch 'master' into filter
htdocs/css/mpd.css
htdocs/js/mpd.js