Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Thu, 16 Apr 2020 14:20:27 +0000 (16:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 16 Apr 2020 14:20:27 +0000 (16:20 +0200)
commitae23ee7ba2ddc40e7b83389951707c60ef305ed0
treebe42b966638641fd699f529cead38b68ec7d5a1e
parentdb7cf93e89656f11c00fa2f9a55842d00df7f8be
parent3486503d8a2ff599271da875a4b5396e7dfc6b80
Merge branch '3.1' into 5.2
com.woltlab.wcf/templates/articleList.tpl