]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into slider
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)
commit173e2da47a2dd567f8095dedb8806d96ebc63c98
tree61a9238f9f98ad2c8a74d7917b803044f5759c9d
parent89a590265a92359c0dbf5c2088c2c7a1ea80e247
parent545f29933987890113db309959d7766508a2d00d
Merge remote-tracking branch 'origin/master' into slider

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