From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 28 Jul 2016 09:34:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: 3.0.0_Beta_1~947
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac2b7b525046a635e67fd31b94d00068acc8b95a;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/next' into next

# Conflicts:
#	wcfsetup/install/files/acp/templates/pageMenuMobile.tpl
---

ac2b7b525046a635e67fd31b94d00068acc8b95a