From: Marcel Werk Date: Fri, 6 Jun 2014 21:09:24 +0000 (+0200) Subject: Merge branch '2.0' X-Git-Tag: 2.1.0_Alpha_1~714^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ba7e2bc9b6fc03c8905362e551a6a4a5e37f826;p=GitHub%2FWoltLab%2FWCF.git Merge branch '2.0' Conflicts: com.woltlab.wcf/package.xml --- 7ba7e2bc9b6fc03c8905362e551a6a4a5e37f826