]> _ Git - fluidbook-html5.git/commitdiff
projects / fluidbook-html5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f05d47 4e7ef3b)
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 7 Dec 2018 11:49:01 +0000 (12:49 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 7 Dec 2018 11:49:01 +0000 (12:49 +0100)
# Conflicts:
# js/libs/fluidbook/fluidbook.pagetransitions.js

1  2 
js/libs/fluidbook/fluidbook.pagetransitions.js patch | diff1 | diff2 | blob | history

Unnamed repository; edit this file 'description' to name the repository.