From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 1 Aug 2018 14:30:53 +0000 (+0200)
Subject: Merge branch '3.0'
X-Git-Tag: 3.1.5~20
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a25324711552971f5a78b50b6034280dc7edfb03;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '3.0'
---

a25324711552971f5a78b50b6034280dc7edfb03