From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 30 May 2016 16:42:04 +0000 (+0200)
Subject: Merge branch 'email-template' into next
X-Git-Tag: 3.0.0_Beta_1~1568
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e784da71a4b360353ed41f9673a8ceac38a617cd;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'email-template' into next
---

e784da71a4b360353ed41f9673a8ceac38a617cd