]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 29 Oct 2018 11:23:41 +0000 (12:23 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 29 Oct 2018 11:23:41 +0000 (12:23 +0100)
commit3dd3b7d3d39d2f18ffea50a46aa99b3fe0a54f12
tree94a593edf0477d1d601a1f016906b73566261386
parent9f804fc4ba3bd41634a4296a9245b8ae4eee73a1
parent8b9d76fbdb76a8c7f7d3051b422651848511439d
Merge remote-tracking branch 'origin/master' into 3dflip

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