]> _ Git - fluidbook-html5.git/commit
Merge branch 'master' into burgermenu
authorStephen Cameron <stephen@cubedesigners.com>
Mon, 10 Jul 2017 10:11:07 +0000 (12:11 +0200)
committerStephen Cameron <stephen@cubedesigners.com>
Mon, 10 Jul 2017 10:11:07 +0000 (12:11 +0200)
commitddbd91f6d8f2803098d7304b242d2cb0228feb79
tree9f4936cf93167e2bb09f2d9cc3a00e1474e4defe
parentd64cd33811cf51017261ef97e96bc5dde4263b19
parenta72c9f0ee4927b69660fac74057d38161e6a2519
Merge branch 'master' into burgermenu

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