]> _ Git - fluidbook-html5.git/commitdiff
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 28 Jun 2018 13:44:47 +0000 (15:44 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 28 Jun 2018 13:44:47 +0000 (15:44 +0200)
# Conflicts:
# js/libs/fluidbook/fluidbook.js

1  2 
js/libs/fluidbook/fluidbook.js
style/fluidbook.less

Simple merge
Simple merge