Merge pull request #950 from samhed/disconnectapi

author Samuel Mannehed <samuel@cendio.se>

Fri, 17 Nov 2017 10:01:11 +0000 (11:01 +0100)

committer GitHub <noreply@github.com>

Fri, 17 Nov 2017 10:01:11 +0000 (11:01 +0100)
author Samuel Mannehed <samuel@cendio.se>
Fri, 17 Nov 2017 10:01:11 +0000 (11:01 +0100)
committer GitHub <noreply@github.com>
Fri, 17 Nov 2017 10:01:11 +0000 (11:01 +0100)
diff --cc app/ui.js
Simple merge
diff --cc core/rfb.js
Simple merge
diff --cc vnc_lite.html
Simple merge
author	Samuel Mannehed <samuel@cendio.se>
	Fri, 17 Nov 2017 10:01:11 +0000 (11:01 +0100)
committer	GitHub <noreply@github.com>
	Fri, 17 Nov 2017 10:01:11 +0000 (11:01 +0100)
		1	2
app/ui.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/rfb.js	patch \|	diff1 \|	diff2 \|	blob \| history
vnc_lite.html	patch \|	diff1 \|	diff2 \|	blob \| history