]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 28 Jun 2018 13:44:47 +0000 (15:44 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 28 Jun 2018 13:44:47 +0000 (15:44 +0200)
commitfac978050cca0336abe74d6fe7245a64f70b5fc1
treeaac6659ce03501f19e56a651caef4b05835a59ba
parent9b58d294ee76cd44e5d14116e36b2474a1d81d5b
parent7cf7fae27d91a0ea4e488ded9fc1a547fba21443
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.js
js/libs/fluidbook/fluidbook.js
style/fluidbook.less