From: Marcel Werk Date: Thu, 7 Jan 2016 18:31:37 +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~170 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=deb445e7d97d1a849c56e8be88382fb02374fcdb;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia --- deb445e7d97d1a849c56e8be88382fb02374fcdb