]> _ Git - fluidbook-html5.git/commit
Merge branch 'master' into burgermenu
authorStephen Cameron <stephen@cubedesigners.com>
Tue, 19 Sep 2017 12:54:32 +0000 (14:54 +0200)
committerStephen Cameron <stephen@cubedesigners.com>
Tue, 19 Sep 2017 12:54:32 +0000 (14:54 +0200)
commitf2b6ccac099ac4144d7482c36df0c6f425ccb1ad
tree7030d245253ae6feecf4c350a08e05043e579006
parentbe9e9dc38398bc45831551ed675b1528c6461628
parentc88c3523226d95efe1f9e8a182e145d8f5e9b8b0
Merge branch 'master' into burgermenu

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