Merge branch '5.3' into 5.4

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

Fri, 13 Aug 2021 07:20:30 +0000 (09:20 +0200)

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

Fri, 13 Aug 2021 07:20:30 +0000 (09:20 +0200)
author Tim Düsterhus <duesterhus@woltlab.com>
Fri, 13 Aug 2021 07:20:30 +0000 (09:20 +0200)
committer Tim Düsterhus <duesterhus@woltlab.com>
Fri, 13 Aug 2021 07:20:30 +0000 (09:20 +0200)
diff --cc com.woltlab.wcf/templates/accountManagement.tpl
Simple merge
diff --cc com.woltlab.wcf/templates/emailActivation.tpl
Simple merge
diff --cc com.woltlab.wcf/templates/lostPassword.tpl
Simple merge
diff --cc com.woltlab.wcf/templates/newPassword.tpl
Simple merge
diff --cc com.woltlab.wcf/templates/registerActivation.tpl
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Fri, 13 Aug 2021 07:20:30 +0000 (09:20 +0200)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Fri, 13 Aug 2021 07:20:30 +0000 (09:20 +0200)
		1	2
com.woltlab.wcf/templates/accountManagement.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
com.woltlab.wcf/templates/emailActivation.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
com.woltlab.wcf/templates/lostPassword.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
com.woltlab.wcf/templates/newPassword.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
com.woltlab.wcf/templates/registerActivation.tpl	patch \|	diff1 \|	diff2 \|	blob \| history