Merge branch '5.5'

author Tim Düsterhus <duesterhus@woltlab.com>

Wed, 25 May 2022 13:48:15 +0000 (15:48 +0200)

committer Tim Düsterhus <duesterhus@woltlab.com>

Wed, 25 May 2022 13:48:15 +0000 (15:48 +0200)
author Tim Düsterhus <duesterhus@woltlab.com>
Wed, 25 May 2022 13:48:15 +0000 (15:48 +0200)
committer Tim Düsterhus <duesterhus@woltlab.com>
Wed, 25 May 2022 13:48:15 +0000 (15:48 +0200)
diff --cc wcfsetup/install/files/lib/system/api/composer.lock
Simple merge
diff --cc wcfsetup/install/files/lib/system/api/composer/installed.json
Simple merge
diff --cc wcfsetup/install/files/lib/system/api/composer/installed.php
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Wed, 25 May 2022 13:48:15 +0000 (15:48 +0200)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Wed, 25 May 2022 13:48:15 +0000 (15:48 +0200)
		1	2
wcfsetup/install/files/lib/system/api/composer.lock	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/api/composer/installed.json	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/api/composer/installed.php	patch \|	diff1 \|	diff2 \|	blob \| history