From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 4 Oct 2023 11:46:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1daf39b39ae8142ebe09d23a825e46684ee2df92;p=fluidbook-toolbox-quiz.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/deployment.xml
---

1daf39b39ae8142ebe09d23a825e46684ee2df92
diff --cc .idea/deployment.xml
index 0000000,ef50088..e69de29
mode 000000,100644..100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml