Merge branch 'master' into burgermenu

author Stephen Cameron <stephen@cubedesigners.com>

Tue, 22 Aug 2017 14:45:11 +0000 (16:45 +0200)

committer Stephen Cameron <stephen@cubedesigners.com>

Tue, 22 Aug 2017 14:45:11 +0000 (16:45 +0200)
author Stephen Cameron <stephen@cubedesigners.com>
Tue, 22 Aug 2017 14:45:11 +0000 (16:45 +0200)
committer Stephen Cameron <stephen@cubedesigners.com>
Tue, 22 Aug 2017 14:45:11 +0000 (16:45 +0200)
diff --cc js/libs/fluidbook/fluidbook.desktop.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.js
Simple merge
diff --cc js/libs/fluidbook/fluidbook.menu.js
Simple merge
diff --cc style/fluidbook.less
Simple merge
author	Stephen Cameron <stephen@cubedesigners.com>
	Tue, 22 Aug 2017 14:45:11 +0000 (16:45 +0200)
committer	Stephen Cameron <stephen@cubedesigners.com>
	Tue, 22 Aug 2017 14:45:11 +0000 (16:45 +0200)
		1	2
js/libs/fluidbook/fluidbook.desktop.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/libs/fluidbook/fluidbook.menu.js	patch \|	diff1 \|	diff2 \|	blob \| history
style/fluidbook.less	patch \|	diff1 \|	diff2 \|	blob \| history