]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 7 Dec 2018 11:49:01 +0000 (12:49 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 7 Dec 2018 11:49:01 +0000 (12:49 +0100)
commit222be9c6416e46587b3f8f4805856ba60fcacd1b
tree0a1d968550723947f245fb0b7b8eeb711c6344b5
parent0f05d47aa7e470e24d24ceda23b3a0778eea668d
parent4e7ef3bb8db1a60435b9663d55e90f70d776bb73
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.pagetransitions.js
js/libs/fluidbook/fluidbook.pagetransitions.js