From: Matthias Schmidt Date: Sat, 5 Oct 2019 11:31:30 +0000 (+0200) Subject: Fix bad merge from 'master' into 'next' X-Git-Tag: 5.2.0_Beta_2~10 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0d5a2f63a7dc33fc2a91134a092047ba5a23f612;p=GitHub%2FWoltLab%2FWCF.git Fix bad merge from 'master' into 'next' See 130249b90b243f0757d1b99cb1422590d63d4838 --- 0d5a2f63a7dc33fc2a91134a092047ba5a23f612