From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 20 Nov 2018 19:04:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9a3b9de0e6caa22fd234ea65a0d07339ccb74dc5;p=fluidbook-html5.git

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

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

9a3b9de0e6caa22fd234ea65a0d07339ccb74dc5