]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 6 Nov 2018 16:43:32 +0000 (17:43 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 6 Nov 2018 16:43:32 +0000 (17:43 +0100)
commitda9b64a1fd61af65cd82ad86fd8ea9e3992eaee2
tree72e96922f4a86e246ffd811b63131e02a919701e
parent4cbc9b54756ff029bc08ee7e2ba756b21149f037
parent248ba81acd524024955511594d85cfc9702aa861
Merge remote-tracking branch 'origin/master' into 3dflip

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