Merge branch '5.4'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 12 Jul 2021 14:28:34 +0000 (16:28 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 12 Jul 2021 14:28:34 +0000 (16:28 +0200)
1  2 
com.woltlab.wcf/option.xml
constants.php

Simple merge
diff --cc constants.php
Simple merge