From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 23 Dec 2015 08:32:00 +0000 (+0100)
Subject: Merge branch 'next' into next-lantia
X-Git-Tag: 3.0.0_Beta_1~149^2~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4a91e574e22edad4ca64f75dff56bc747778ce39;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Merge branch 'next' into next-lantia
---

4a91e574e22edad4ca64f75dff56bc747778ce39