projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8705964 50bed09)
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)
# Conflicts:
# ts/WoltLabSuite/Core/Component/Image/Cropper.ts
# wcfsetup/install/files/js/WoltLabSuite/Core/Component/Image/Cropper.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)