From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 26 Jan 2016 18:06:23 +0000 (+0100)
Subject: Merge branch 'refs/heads/pr/1984' into next-lantia
X-Git-Tag: 3.0.0_Beta_1~2030^2~122
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f023450529b91380ceea4cbe17e51d9e864db35;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'refs/heads/pr/1984' into next-lantia

# Conflicts:
#	wcfsetup/install/files/js/WoltLab/WCF/Ui/Like/Handler.js
---

4f023450529b91380ceea4cbe17e51d9e864db35