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

author Vincent Vanwaelscappel <vincent@cubedesigners.com>

Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +0100)

committer Vincent Vanwaelscappel <vincent@cubedesigners.com>

Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +0100)
author Vincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +0100)
committer Vincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +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.loader.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.pagetransitions.js
Simple merge
author	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +0100)
committer	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +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.loader.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.pagetransitions.js	patch \|	diff1 \|	diff2 \|	blob \| history