From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 22 Sep 2014 14:54:07 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~302
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1418f5efdbd51b13d68bdb6f00ced71a6e73dd82;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
	wcfsetup/install/files/js/WCF.ImageViewer.min.js
	wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
	wcfsetup/install/files/lib/system/package/validation/PackageValidationException.class.php
	wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php
	wcfsetup/install/lang/de.xml
	wcfsetup/install/lang/en.xml
---

1418f5efdbd51b13d68bdb6f00ced71a6e73dd82