Merge remote-tracking branch 'origin/6.2' into file-upload-image-crop file-upload-image-crop
authorCyperghost <olaf_schmitz_1@t-online.de>
Tue, 19 Nov 2024 08:16:48 +0000 (09:16 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Tue, 19 Nov 2024 08:16:48 +0000 (09:16 +0100)
commitb6691c47924b65305c2013cbdcf8fa38cd94248e
tree72b664699ddbdc20c33c4fe991903fed76c2e9ad
parent648fa4853b7ceb588decf7a3bd65f9f47e927766
parent885cf8fdbd10deff8ac0371104c230eb4876f5f4
Merge remote-tracking branch 'origin/6.2' into file-upload-image-crop

# Conflicts:
# package-lock.json
# package.json
# wcfsetup/install/lang/en.xml
package-lock.json
package.json
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml