]> _ Git - fluidbook-html5.git/commit
Merge branch 'master' into robustsearch
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 15 Sep 2023 12:00:52 +0000 (14:00 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 15 Sep 2023 12:00:52 +0000 (14:00 +0200)
commit91f4f779102f48d44e1a1cd1c38cf93e4da445cc
treebe1211da69cd84532c7aa0425ed225c4cb980ee5
parent154749f2ab87a7100db296dc80afcb661de03ce6
parent56644ff8811f74e7ac8478c2ab22ee860f0b4fc5
Merge branch 'master' into robustsearch

# Conflicts:
# js/libs/fluidbook/fluidbook.search.js
js/libs/fluidbook/fluidbook.js