Merge branch '3.1' into 5.2
authorAlexander Ebert <ebert@woltlab.com>
Sat, 27 Jun 2020 11:43:48 +0000 (13:43 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 27 Jun 2020 11:43:48 +0000 (13:43 +0200)
commit24cbffed831ae0ffbc6239569b0ff3dbc2337c55
tree228f5255d42a57e240aa4328bc9d0d681eaaf6d1
parent53f92bba9be098a94d796acc4d6986bed91bc8a8
parent7ca3d3b162dc72481bc085de854b6566d0e16880
Merge branch '3.1' into 5.2
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/condition/AbstractMultiCategoryCondition.class.php
wcfsetup/install/files/lib/system/condition/AbstractMultiSelectCondition.class.php
wcfsetup/install/files/lib/system/condition/AbstractSelectCondition.class.php
wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
wcfsetup/install/files/lib/system/condition/UserTrophyCondition.class.php