Merge remote-tracking branch 'origin/master' into 3dflip

author Vincent Vanwaelscappel <vincent@cubedesigners.com>

Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)

committer Vincent Vanwaelscappel <vincent@cubedesigners.com>

Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)
author Vincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)
committer Vincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)
diff --cc js/libs/fluidbook/fluidbook.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.links.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.pagetransitions.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.support.js
Simple merge
author	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)
committer	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)
		1	2
js/libs/fluidbook/fluidbook.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.links.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.pagetransitions.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.support.js	patch \|	diff1 \|	diff2 \|	blob \| history