Merge pull request #149 from SuperBFG7/delete

author Andy <andy@ndyk.de>

Mon, 22 Jan 2018 03:34:54 +0000 (04:34 +0100)

committer GitHub <noreply@github.com>

Mon, 22 Jan 2018 03:34:54 +0000 (04:34 +0100)
author Andy <andy@ndyk.de>
Mon, 22 Jan 2018 03:34:54 +0000 (04:34 +0100)
committer GitHub <noreply@github.com>
Mon, 22 Jan 2018 03:34:54 +0000 (04:34 +0100)
diff --cc htdocs/index.html
Simple merge
diff --cc htdocs/js/mpd.js
Simple merge
author	Andy <andy@ndyk.de>
	Mon, 22 Jan 2018 03:34:54 +0000 (04:34 +0100)
committer	GitHub <noreply@github.com>
	Mon, 22 Jan 2018 03:34:54 +0000 (04:34 +0100)
		1	2
htdocs/index.html	patch \|	diff1 \|	diff2 \|	blob \| history
htdocs/js/mpd.js	patch \|	diff1 \|	diff2 \|	blob \| history