Merge remote-tracking branch 'origin/centerbook'

author Vincent Vanwaelscappel <vincent@cubedesigners.com>

Wed, 22 Nov 2017 14:08:38 +0000 (15:08 +0100)

committer Vincent Vanwaelscappel <vincent@cubedesigners.com>

Wed, 22 Nov 2017 14:08:38 +0000 (15:08 +0100)
author Vincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 22 Nov 2017 14:08:38 +0000 (15:08 +0100)
committer Vincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 22 Nov 2017 14:08:38 +0000 (15:08 +0100)
diff --cc js/libs/fluidbook/fluidbook.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.nav.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.resize.js
Simple merge
author	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Wed, 22 Nov 2017 14:08:38 +0000 (15:08 +0100)
committer	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Wed, 22 Nov 2017 14:08:38 +0000 (15:08 +0100)
		1	2
js/libs/fluidbook/fluidbook.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.nav.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.resize.js	patch \|	diff1 \|	diff2 \|	blob \| history