Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Sun, 31 Mar 2019 17:30:56 +0000 (19:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 31 Mar 2019 17:30:56 +0000 (19:30 +0200)

Trivial merge