Merge branch 'file-upload-image-crop' into avatar-file-processor
authorCyperghost <olaf_schmitz_1@t-online.de>
Mon, 16 Dec 2024 11:54:04 +0000 (12:54 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Mon, 16 Dec 2024 11:54:04 +0000 (12:54 +0100)
commita44bea3c959dda9ca50ff9014e2e28e65301a35c
tree891503512a14d1f7365369f48313205694475142
parent870596437e446428e88976543bfcf4b992a2d5ca
parent50bed09cf1f39a088de14b94be5f6f4b3bf4f674
Merge branch 'file-upload-image-crop' into avatar-file-processor

# Conflicts:
# ts/WoltLabSuite/Core/Component/Image/Cropper.ts
# wcfsetup/install/files/js/WoltLabSuite/Core/Component/Image/Cropper.js