From: Marcel Werk Date: Fri, 4 Dec 2015 17:37:29 +0000 (+0100) Subject: Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia X-Git-Tag: 3.0.0_Beta_1~2030^2~212 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=537c52ddb0106ddcbc8163c577c08169710757ef;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia --- 537c52ddb0106ddcbc8163c577c08169710757ef