]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/burgermenu' into searchengine
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 20 Sep 2017 16:18:54 +0000 (18:18 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 20 Sep 2017 16:18:54 +0000 (18:18 +0200)
commit33943d0d49f91e848c3e06b53f6da5c8a30aa676
tree03bf73043b5c4d66cda2a0289e5b3c98c05912a5
parent190e62a6ad7e6e249ad56161c33d9d29fb5a2636
parent929f99c68b60a0373d0f048aa2534c8d50f5b2ed
Merge remote-tracking branch 'origin/burgermenu' into searchengine

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