]> _ Git - fluidbook-html5.git/commitdiff
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 20 Nov 2018 19:04:31 +0000 (20:04 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 20 Nov 2018 19:04:31 +0000 (20:04 +0100)
# Conflicts:
# js/libs/fluidbook/fluidbook.js

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

Simple merge