Merge branch 'file-upload-image-crop' into avatar-file-processor
authorCyperghost <olaf_schmitz_1@t-online.de>
Mon, 2 Dec 2024 09:05:37 +0000 (10:05 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Mon, 2 Dec 2024 09:05:37 +0000 (10:05 +0100)
commit41f636dc27796188820fcad5b5f1792cc72c3c66
treed5731c46469ec3a993cf365085b500f8894f5a65
parent0eb36d5c875503dcf1eadcd590e05c199b82075e
parentbb9d061cdb324e5f665ef204cd14bc99af55691f
Merge branch 'file-upload-image-crop' into avatar-file-processor

# Conflicts:
# wcfsetup/install/files/lib/data/attachment/AttachmentList.class.php