git.stricted.de - GitHub/WoltLab/WCF.git/commit

author	Cyperghost <olaf_schmitz_1@t-online.de>
	Thu, 12 Dec 2024 10:07:27 +0000 (11:07 +0100)
committer	Cyperghost <olaf_schmitz_1@t-online.de>
	Thu, 12 Dec 2024 10:07:27 +0000 (11:07 +0100)
commit	fc90f963a65d8febb4c5c4f9da1f1e91f09ec2d0
tree	3fedb2470977856d517a35d68dd4fde8d7611749	tree \| snapshot (tar.gz zip)
parent	1c6b8050b82bbbe477e2c13e105b69cd5d5c5b63	commit \| diff
parent	9ec543e3670500ce8875a64fdd21febe4ab19c69	commit \| diff

Merge branch '6.2' into file-upload-image-crop

# Conflicts:
# .github/workflows/javascript.yml
# wcfsetup/install/files/js/require.config.js

WoltLab Suite Core (previously WoltLab Community Framework)

.github/workflows/javascript.yml	diff1 \|	diff2 \|	blob \| history
package-lock.json	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/require.config.js	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	diff1 \|	diff2 \|	blob \| history