Merge branch 'file-upload-image-crop' into avatar-file-processor
authorCyperghost <olaf_schmitz_1@t-online.de>
Thu, 12 Dec 2024 10:50:52 +0000 (11:50 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Thu, 12 Dec 2024 10:50:52 +0000 (11:50 +0100)
commitf90b328936357509981cb3f8cf0bdb3924287cc0
treeab14df73ee69f84cd99aa3fec41442575680d521
parent5f9a32246d4aa919694f78b7de9f5a23dd36f6c0
parentfc90f963a65d8febb4c5c4f9da1f1e91f09ec2d0
Merge branch 'file-upload-image-crop' into avatar-file-processor

# Conflicts:
# com.woltlab.wcf/templates/user.tpl
# wcfsetup/install/files/lib/data/attachment/Attachment.class.php
# wcfsetup/install/lang/de.xml
# wcfsetup/install/lang/en.xml
com.woltlab.wcf/fileDelete.xml
com.woltlab.wcf/templates/user.tpl
ts/WoltLabSuite/Core/Bootstrap.ts
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
wcfsetup/install/files/lib/data/attachment/Attachment.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml