Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 23 Aug 2018 12:17:04 +0000 (14:17 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 23 Aug 2018 12:17:04 +0000 (14:17 +0200)
commitb397ca9fcbba8f2407eaf93aa10886cbe767e175
tree2c78b9230130d1c94e2fd91c15871a0fe73a61a6
parent2ed23910dc94fbf1d10ec2f03e04b252534bb900
parentb0c19d3968347ffeb9c1928156c62b6f372b9ab7
Merge branch 'master' into next
wcfsetup/install.php
wcfsetup/install/files/lib/core.functions.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
wcfsetup/install/lang/en.xml