From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 28 Jun 2017 16:05:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into slider
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=173e2da47a2dd567f8095dedb8806d96ebc63c98;p=fluidbook-html5.git

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

# Conflicts:
#	style/fluidbook.less
---

173e2da47a2dd567f8095dedb8806d96ebc63c98