From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 7 Dec 2018 11:49:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=222be9c6416e46587b3f8f4805856ba60fcacd1b;p=fluidbook-html5.git

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

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

222be9c6416e46587b3f8f4805856ba60fcacd1b