From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 28 Jun 2018 13:44:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fac978050cca0336abe74d6fe7245a64f70b5fc1;p=fluidbook-html5.git

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

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

fac978050cca0336abe74d6fe7245a64f70b5fc1