]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)
commitc15f833c1434872fc57546bdd30ad05bd5dce61d
tree2d301fa1e3a6094595f22c927fed674a9ebba77d
parent29c53a229be1aebfef18f73d05f65378f00cb1e5
parentd89ce75d71cbb51b5100c01670a165f2e68cab9c
Merge remote-tracking branch 'origin/master' into 3dflip

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