Merge branch 'master' into next
authorJoshua Rüsweg <ruesweg@woltlab.com>
Thu, 19 Dec 2019 19:28:27 +0000 (20:28 +0100)
committerJoshua Rüsweg <ruesweg@woltlab.com>
Thu, 19 Dec 2019 19:28:27 +0000 (20:28 +0100)
commit8c785472faeb7229361aa8402d25cfc6632d8a96
treee113db88c067d9230d878a84ae41927f7ac7112c
parent4c1f23d33a354bb4ed65c14e90b5c9edd193082f
parent0f6c7fdd09cec7d2f8854fb46dba49fee76aaf08
Merge branch 'master' into next
wcfsetup/install/files/lib/system/condition/user/trophy/UserTrophyExcludedTrophyCategoriesCondition.class.php