]> _ Git - fluidbook-html5.git/commit
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)
commit9a3b9de0e6caa22fd234ea65a0d07339ccb74dc5
treeef5fbcfcf4d541edef0406146a258edfa631b25c
parentd449c6f3d060b8545492515ee49a6a380c50687e
parent95e61100f2eac7d677753a89a918d86d00dd4d64
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.js
js/libs/fluidbook/fluidbook.resize.js
js/libs/fluidbook/fluidbook.support.js