Merge branch 'refs/heads/master' into upload-form-field-v2
authorCyperghost <olaf_schmitz_1@t-online.de>
Mon, 24 Jun 2024 08:18:04 +0000 (10:18 +0200)
committerCyperghost <olaf_schmitz_1@t-online.de>
Mon, 24 Jun 2024 08:18:04 +0000 (10:18 +0200)
commit3f895d000a6e99732fc184358bc72a5182cc0e84
tree717b96765c825ea5abfb7a6d621753bc4f9dbf83
parent97ea5ff90995aee7fb23d3841c71570f6ff29703
parent1eba6a44e6a6a6d9c51f893b6a63d0a2c159e78c
Merge branch 'refs/heads/master' into upload-form-field-v2

# Conflicts:
# wcfsetup/install/files/style/ui/attachment.scss
ts/WoltLabSuite/Core/Component/Attachment/Entry.ts
wcfsetup/install/files/js/WoltLabSuite/Core/Component/Attachment/Entry.js
wcfsetup/install/files/lib/data/file/File.class.php
wcfsetup/install/files/style/ui/attachment.scss
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml