Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 16 Sep 2019 17:08:18 +0000 (19:08 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 16 Sep 2019 17:08:18 +0000 (19:08 +0200)
commitef4d40079d78a9b87080ac001624c10559504785
tree4c1d269c8bdece769cf62ec4edac831e4c1cda53
parentb168f9c9705068471dd709977454608f7da4791b
parent8930f5d96b056e7b04d2bf0fbc2ce49cd3a0ab0a
Merge branch 'master' into next
com.woltlab.wcf/templates/articleList.tpl
com.woltlab.wcf/templates/categoryArticleList.tpl