Merge branch 'master' into mfa-meta

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

Mon, 7 Dec 2020 10:05:24 +0000 (11:05 +0100)

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

Mon, 7 Dec 2020 10:05:35 +0000 (11:05 +0100)
author Tim Düsterhus <duesterhus@woltlab.com>
Mon, 7 Dec 2020 10:05:24 +0000 (11:05 +0100)
committer Tim Düsterhus <duesterhus@woltlab.com>
Mon, 7 Dec 2020 10:05:35 +0000 (11:05 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
diff --cc syncTemplates.json
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 7 Dec 2020 10:05:24 +0000 (11:05 +0100)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 7 Dec 2020 10:05:35 +0000 (11:05 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
syncTemplates.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