Merge pull request #3846 from WoltLab/54-typescript

author Alexander Ebert <ebert@woltlab.com>

Tue, 5 Jan 2021 12:20:23 +0000 (13:20 +0100)

committer GitHub <noreply@github.com>

Tue, 5 Jan 2021 12:20:23 +0000 (13:20 +0100)
author Alexander Ebert <ebert@woltlab.com>
Tue, 5 Jan 2021 12:20:23 +0000 (13:20 +0100)
committer GitHub <noreply@github.com>
Tue, 5 Jan 2021 12:20:23 +0000 (13:20 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Tue, 5 Jan 2021 12:20:23 +0000 (13:20 +0100)
committer	GitHub <noreply@github.com>
	Tue, 5 Jan 2021 12:20:23 +0000 (13:20 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history