From 88837bf6eb88cfddf78e90b6817f7eb61202c519 Mon Sep 17 00:00:00 2001 From: SurfaceS Date: Sat, 9 Sep 2023 14:56:09 +0200 Subject: [PATCH] Merge ums/main into v14-main Conflicts: pom.xml react-client/package.json react-client/yarn.lock --- pom.xml | 2 +- react-client/package.json | 22 ++-- react-client/yarn.lock | 240 +++++++++++++++++++------------------- 3 files changed, 132 insertions(+), 132 deletions(-) diff --git a/pom.xml b/pom.xml index 79951dd00a4..9af43552e40 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ Check the org.slf4j:slf4j-api version of the other libraries before upgrading --> - 2.0.7 + 2.0.9