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

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

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

8ffe18b49388ae09342b8da9a6209a55a1f49ca7