]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into diaporama
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 27 Jun 2018 12:44:28 +0000 (14:44 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 27 Jun 2018 12:44:28 +0000 (14:44 +0200)
commit26192bdf2a8b55cb3ae9370a4567d57ee69342c2
tree9fd39c9297313f3563ced858abee9903224e70d3
parentc27e2c997bbeb67c856b71fc4115793d5d0187f0
parent1b1e184e7ff255e9eed4e7c8e43bf0d302ff9c70
Merge remote-tracking branch 'origin/master' into diaporama

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