Merge branch '5.4'

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

Mon, 13 Dec 2021 12:38:43 +0000 (13:38 +0100)

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

Mon, 13 Dec 2021 12:38:43 +0000 (13:38 +0100)
author Tim Düsterhus <duesterhus@woltlab.com>
Mon, 13 Dec 2021 12:38:43 +0000 (13:38 +0100)
committer Tim Düsterhus <duesterhus@woltlab.com>
Mon, 13 Dec 2021 12:38:43 +0000 (13:38 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 13 Dec 2021 12:38:43 +0000 (13:38 +0100)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 13 Dec 2021 12:38:43 +0000 (13:38 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history