Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2020 15:38:51 +0000 (17:38 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2020 15:38:51 +0000 (17:38 +0200)
commit227cfaa7eb148e2a1ff7df2bd2cd14681596180d
tree18a5871df7d45d1eef853247fd9d9750363ccb79
parent0bde58beb2bdc655809701bf9ecaffa769d86918
parent9a35a96cdd899f89a6de2b64448e6cb7c8b34d29
Merge branch '3.1' into 5.2
wcfsetup/install/files/lib/data/article/content/ViewableArticleContentList.class.php
wcfsetup/install/files/lib/data/media/ViewableMediaList.class.php