]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master'
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 28 Aug 2017 10:49:27 +0000 (12:49 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 28 Aug 2017 10:49:27 +0000 (12:49 +0200)
commit9980f9b7a0142d0f86ce74363c8a0a8179578f0f
tree11ecc7ae5a8a8489a785e134ef88e11ad7f94d1d
parentcdb1005f8aab5ee9d8a505f3341d4038cb53f1bf
parentecdd1a0d44398524e9e529a0ce6a1bef477d4f2d
Merge remote-tracking branch 'origin/master'

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