]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 14 Dec 2018 17:56:01 +0000 (18:56 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 14 Dec 2018 17:56:01 +0000 (18:56 +0100)
commit167a108c130abcb4123b6a5cd1845a210cf382fd
tree38716a795f74324f05de0c03d55640e7e67c4214
parent611237a9e806b88ac69a47417cd12e834fd348a0
parent3f55c5b1877f4319657393691ae0732f5328da50
Merge remote-tracking branch 'origin/master' into 3dflip

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