From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 26 Sep 2014 16:38:12 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~296
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5636a4897d459c092715e13d571b176aef904734;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

5636a4897d459c092715e13d571b176aef904734