]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/printing'
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 30 Jan 2019 14:01:22 +0000 (15:01 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 30 Jan 2019 14:01:22 +0000 (15:01 +0100)
commit9fd97e0bbc17867978124e53b16b58576924bdf9
tree570d4bf0720b5a268408ebb005ba8928dde5ed11
parent23dd97f00b964ae067d57dad8811c3dd99d5cc76
parentf72debafa148f293ae44d601f305ac986dc725a8
Merge remote-tracking branch 'origin/printing'

# Conflicts:
# js/libs/fluidbook/fluidbook.print.js
# style/mixins.less
js/libs/fluidbook/fluidbook.js
js/libs/fluidbook/fluidbook.menu.js
js/libs/fluidbook/fluidbook.print.js
style/fluidbook.less
style/mixins.less