]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 20 Jul 2018 13:23:31 +0000 (15:23 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 20 Jul 2018 13:23:31 +0000 (15:23 +0200)
commit7b3f42088fc622557090b600761094de9549a488
tree9e3e5d5fa5722f3d0ccafec34902ec7e56e6f248
parent43da7899316e25465b66ae05240f4b7066cf79c2
parent6a972c7f90344c8b53c54313511c4ad4978b4dd0
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# _index.html
# js/libs/fluidbook/fluidbook.js
# js/libs/fluidbook/fluidbook.loader.js
_index.html
js/libs/fluidbook/fluidbook.js
js/libs/fluidbook/fluidbook.links.js
js/libs/fluidbook/fluidbook.loader.js
js/libs/fluidbook/fluidbook.resize.js
style/fluidbook.less