]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 24 Oct 2018 13:53:09 +0000 (15:53 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 24 Oct 2018 13:53:09 +0000 (15:53 +0200)
commitef991585cf057637fb23bc2516bcdee84d200d30
treea5d6a7c450f8ba9b3c3d5f2610e6caeae719a974
parent09f78bc45f7bff3c4c5afbe8280165ef82b9e0be
parent5724a29c6720d5fe2849117110686362f6c416d9
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.js
# js/libs/fluidbook/fluidbook.links.js
# js/libs/fluidbook/fluidbook.loader.js
# js/libs/fluidbook/fluidbook.resize.js
# js/libs/fluidbook/fluidbook.zoom.js
# js/main.js
js/libs/fluidbook/fluidbook.js
js/libs/fluidbook/fluidbook.links.js
js/libs/fluidbook/fluidbook.loader.js
js/libs/fluidbook/fluidbook.nav.js
js/libs/fluidbook/fluidbook.resize.js
js/libs/fluidbook/fluidbook.zoom.js
js/main.js
style/fluidbook.less