projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0eb36d5 bb9d061)
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)
# Conflicts:
# wcfsetup/install/files/lib/data/attachment/AttachmentList.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)