]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +0100)
commit8ffe18b49388ae09342b8da9a6209a55a1f49ca7
tree5b68a5f9de9b020230a88ff5ee81315e3cfe1634
parenta6855d58db874f05b4d70b74002a558f194928e9
parentb69fda9471da04bdef6fafe273bac21a229116bd
Merge remote-tracking branch 'origin/master' into 3dflip

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