Merge branch '5.5'

diff --cc package-lock.json
index f7138e8fddaffc92e92cfd6395a66a810a6a0214,f9600c27d6cb16bd2a8ea5d857686d2d7dae365c..b20aba187d490c7cf208f0c70a4b90e31ef0855b
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -18,14 -13,12 +18,14 @@@
          "@types/jquery": "^3.5.14",
          "@types/perfect-scrollbar": "^0.7.0",
          "@types/pica": "^5.1.3",
 -        "@types/prismjs": "^1.16.6",
 +        "@types/prismjs": "^1.26.0",
          "@types/twitter-for-web": "0.0.2",
 -        "focus-trap": "^6.9.4",
 +        "focus-trap": "^7.5.2",
 +        "html-parsed-element": "^0.4.1",
          "qr-creator": "^1.0.0",
 -        "tabbable": "^5.3.3",
 +        "reflect-metadata": "^0.1.13",
 +        "tabbable": "^6.2.0",
-         "tslib": "^2.6.0"
+         "tslib": "^2.6.1"
        },
        "devDependencies": {
          "@typescript-eslint/eslint-plugin": "^5.61.0",

diff --cc package.json
index d7bd2eab0c72a25c5f5a30e2f8eaadcc005550f7,4d2e4fd7eb156c4e56215927fb4a625f05230a90..c12a76e9d31b452f70af20759814dc3c45a3ff9a
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -14,25 -15,16 +14,25 @@@
      "typescript": "^5.1.6"
    },
    "dependencies": {
 -    "@types/google.maps": "^3.53.4",
 -    "@types/perfect-scrollbar": "^0.7.0",
 +    "@ckeditor/ckeditor5-autosave": "^37.1.0",
 +    "@ckeditor/ckeditor5-code-block": "^37.1.0",
 +    "@ckeditor/ckeditor5-core": "^37.1.0",
 +    "@ckeditor/ckeditor5-editor-classic": "^37.1.0",
 +    "@ckeditor/ckeditor5-inspector": "^4.1.0",
 +    "@ckeditor/ckeditor5-mention": "^37.1.0",
 +    "@googlemaps/markerclusterer": "^2.0.15",
      "@types/facebook-js-sdk": "^3.3.6",
 +    "@types/google.maps": "^3.53.4",
      "@types/jquery": "^3.5.14",
 +    "@types/perfect-scrollbar": "^0.7.0",
      "@types/pica": "^5.1.3",
 -    "@types/prismjs": "^1.16.6",
 +    "@types/prismjs": "^1.26.0",
      "@types/twitter-for-web": "0.0.2",
 -    "focus-trap": "^6.9.4",
 +    "focus-trap": "^7.5.2",
 +    "html-parsed-element": "^0.4.1",
      "qr-creator": "^1.0.0",
 -    "tabbable": "^5.3.3",
 +    "reflect-metadata": "^0.1.13",
 +    "tabbable": "^6.2.0",
-     "tslib": "^2.6.0"
+     "tslib": "^2.6.1"
    }
  }

diff --cc wcfsetup/install/files/lib/util/FileUtil.class.php
Simple merge