]> _ Git - fluidbook-html5.git/commitdiff
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 29 Oct 2018 11:23:41 +0000 (12:23 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 29 Oct 2018 11:23:41 +0000 (12:23 +0100)
# Conflicts:
# js/libs/fluidbook/fluidbook.resize.js

1  2 
js/libs/fluidbook/fluidbook.resize.js

Simple merge