Merge pull request #6047 from WoltLab/file-upload-image-crop

author Olaf Braun <olaf_schmitz_1@t-online.de>

Mon, 23 Dec 2024 07:56:57 +0000 (08:56 +0100)

committer GitHub <noreply@github.com>

Mon, 23 Dec 2024 07:56:57 +0000 (08:56 +0100)
author Olaf Braun <olaf_schmitz_1@t-online.de>
Mon, 23 Dec 2024 07:56:57 +0000 (08:56 +0100)
committer GitHub <noreply@github.com>
Mon, 23 Dec 2024 07:56:57 +0000 (08:56 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Olaf Braun <olaf_schmitz_1@t-online.de>
	Mon, 23 Dec 2024 07:56:57 +0000 (08:56 +0100)
committer	GitHub <noreply@github.com>
	Mon, 23 Dec 2024 07:56:57 +0000 (08:56 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history