Merge branch '5.3'

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

Tue, 17 Nov 2020 14:47:05 +0000 (15:47 +0100)

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

Tue, 17 Nov 2020 14:47:05 +0000 (15:47 +0100)
author Tim Düsterhus <duesterhus@woltlab.com>
Tue, 17 Nov 2020 14:47:05 +0000 (15:47 +0100)
committer Tim Düsterhus <duesterhus@woltlab.com>
Tue, 17 Nov 2020 14:47:05 +0000 (15:47 +0100)
diff --cc com.woltlab.wcf/templates/user.tpl
Simple merge
diff --cc syncTemplates.json
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Tue, 17 Nov 2020 14:47:05 +0000 (15:47 +0100)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Tue, 17 Nov 2020 14:47:05 +0000 (15:47 +0100)
		1	2
com.woltlab.wcf/templates/user.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
syncTemplates.json	patch \|	diff1 \|	diff2 \|	blob \| history