From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 29 Oct 2018 11:23:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3dd3b7d3d39d2f18ffea50a46aa99b3fe0a54f12;p=fluidbook-html5.git

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

# Conflicts:
#	js/libs/fluidbook/fluidbook.resize.js
---

3dd3b7d3d39d2f18ffea50a46aa99b3fe0a54f12