Merge pull request #3761 from WoltLab/54-typescript-misc

author Alexander Ebert <ebert@woltlab.com>

Fri, 27 Nov 2020 12:32:32 +0000 (13:32 +0100)

committer GitHub <noreply@github.com>

Fri, 27 Nov 2020 12:32:32 +0000 (13:32 +0100)
author Alexander Ebert <ebert@woltlab.com>
Fri, 27 Nov 2020 12:32:32 +0000 (13:32 +0100)
committer GitHub <noreply@github.com>
Fri, 27 Nov 2020 12:32:32 +0000 (13:32 +0100)
diff --cc global.d.ts
Simple merge
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
Simple merge
diff --cc wcfsetup/install/files/ts/WoltLabSuite/Core/Bootstrap.js
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Fri, 27 Nov 2020 12:32:32 +0000 (13:32 +0100)
committer	GitHub <noreply@github.com>
	Fri, 27 Nov 2020 12:32:32 +0000 (13:32 +0100)
		1	2
global.d.ts	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/ts/WoltLabSuite/Core/Bootstrap.js	patch \|	diff1 \|	diff2 \|	blob \| history