From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 7 May 2017 14:28:02 +0000 (+0200)
Subject: Merge branch '2.0' into 2.1
X-Git-Tag: 3.1.0_Beta_1~6^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e3d9127a3d67d142205c37de7fab083b0e2484ac;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.legalNotice.git

Merge branch '2.0' into 2.1
---

e3d9127a3d67d142205c37de7fab083b0e2484ac