Merge branch '6.2' into file-upload-image-crop

# Conflicts:
#	.github/workflows/javascript.yml
#	wcfsetup/install/files/js/require.config.js

diff --cc .github/workflows/javascript.yml
index 19c11cd78dbdaa5ffc2689476f474a5576e821bc,8048cff6a22cffd2eb63772c9a567473fa5abecd..e1756904900de412ca6fbea0950108f7c8c18579
--- 1/.github/workflows/javascript.yml
--- 2/.github/workflows/javascript.yml
+++ b/.github/workflows/javascript.yml
@@@ -71,9 -71,6 +71,12 @@@ jobs
      - name: "Check '@fancyapps/ui'"
        run: |
          diff -wu wcfsetup/install/files/js/3rdParty/fancybox/fancybox.umd.js node_modules/@fancyapps/ui/dist/fancybox/fancybox.umd.js
+     - name: "Check 'sortablejs'"
+       run: |
+         diff -wu wcfsetup/install/files/js/3rdParty/Sortable.min.js node_modules/sortablejs/Sortable.min.js
 +    - name: "Check 'cropperjs'"
 +      run: |
 +        diff -wu wcfsetup/install/files/js/3rdParty/cropper.min.js node_modules/cropperjs/dist/cropper.min.js
 +    - name: "Check 'exifreader'"
 +      run: |
 +        diff -wu wcfsetup/install/files/js/3rdParty/exif-reader.js node_modules/exifreader/dist/exif-reader.js

diff --cc package-lock.json
Simple merge

diff --cc package.json
Simple merge

diff --cc wcfsetup/install/files/js/require.config.js
index 0842d35f7007352c36d92d1aa28451b1c95bec84,c4531f8476024e707f3015e1b410c0dc8fb55d12..8ff5950e0ec7e07c2abcfe25710d24311c88a15a
--- 1/wcfsetup/install/files/js/require.config.js
--- 2/wcfsetup/install/files/js/require.config.js
+++ b/wcfsetup/install/files/js/require.config.js
@@@ -18,8 -18,7 +18,9 @@@ requirejs.config(
                "ckeditor5-translation": "3rdParty/ckeditor/translations",
                "diff-match-patch": "3rdParty/diff-match-patch/diff_match_patch.min",
                "emoji-picker-element": "3rdParty/emoji-picker-element.min",
+               sortablejs: "3rdParty/Sortable.min",
 +              cropperjs: "3rdParty/cropper.min",
 +              exifreader: "3rdParty/exif-reader",
        },
        packages: [
                {

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge