From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 27 Jun 2018 13:27:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into diaporama
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4040af2373b0dacba41b1ea0050c6ccf9045df62;p=fluidbook-html5.git

Merge remote-tracking branch 'origin/master' into diaporama
---

4040af2373b0dacba41b1ea0050c6ccf9045df62