From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 10 Jul 2014 13:44:19 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~587
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5a71d6cdbc407e07c2c4791da29a8a1cde91b910;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.min.js
---

5a71d6cdbc407e07c2c4791da29a8a1cde91b910