Merge branch 'master' of http://git.roojs.com/roojs1

author john <john@roojs.com>

Fri, 7 Dec 2018 04:05:27 +0000 (12:05 +0800)

committer john <john@roojs.com>

Fri, 7 Dec 2018 04:05:27 +0000 (12:05 +0800)
author john <john@roojs.com>
Fri, 7 Dec 2018 04:05:27 +0000 (12:05 +0800)
committer john <john@roojs.com>
Fri, 7 Dec 2018 04:05:27 +0000 (12:05 +0800)
diff --cc roojs-bootstrap-debug.js
Simple merge
diff --cc roojs-bootstrap.js
Simple merge
author	john <john@roojs.com>
	Fri, 7 Dec 2018 04:05:27 +0000 (12:05 +0800)
committer	john <john@roojs.com>
	Fri, 7 Dec 2018 04:05:27 +0000 (12:05 +0800)
		1	2
roojs-bootstrap-debug.js	patch \|	diff1 \|	diff2 \|	blob \| history
roojs-bootstrap.js	patch \|	diff1 \|	diff2 \|	blob \| history