]> _ Git - fluidbook-html5.git/commit
Merge remote-tracking branch 'origin/master' into bookedges
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 15 Sep 2017 09:51:22 +0000 (11:51 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 15 Sep 2017 09:51:22 +0000 (11:51 +0200)
commit10e0d965988496f0e04d42609cab8da61194c748
tree01ba139c565db7b27958cd1dade176c60aab3226
parentd0edcfc19928d64b623e8aa3943284b43b1fa33a
parent5ff6c9f0952b5e8cf5db949a838de210d66fe907
Merge remote-tracking branch 'origin/master' into bookedges

# Conflicts:
# style/fluidbook.less
style/fluidbook.less