]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into ecommerceremarkable
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 24 Apr 2018 13:04:11 +0000 (15:04 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 24 Apr 2018 13:04:11 +0000 (15:04 +0200)
commit060a18665bbe821f6f313acab09866fab458457f
treedbb61a6fb90515517a78ac435e0e8cf5cfa3441f
parent6a9e310bfc234e365b76724d94281184b05e3220
parent086b9591e2a76b438d01eeb5408f5e304d025225
Merge remote-tracking branch 'origin/master' into ecommerceremarkable

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