Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 21 Aug 2016 13:42:08 +0000 (15:42 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 21 Aug 2016 13:42:08 +0000 (15:42 +0200)
commitf28be008cd72f026cbb0d8898c583bb1b1ea60ed
tree57501b290e378d36b4eeb5108d84e41defbeecca
parent74ec639318b210780bb63866ef5ed1b23fddf279
parent109e70e761a6bb4a22992896f6f2e8ef729cf99d
Merge branch 'master' into next

# Conflicts:
#
wcfsetup/install/files/lib/system/cronjob/UserGroupAssignmentCronjob.cla
ss.php
wcfsetup/install/files/lib/system/cronjob/UserGroupAssignmentCronjob.class.php