From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 5 Feb 2019 11:29:20 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=040ab352a543bdaa7ac4c078db0fc24f0db37d5a;p=akkoma

Merge branch 'patch-2' into 'develop'

ARGLE GARBLE

See merge request pleroma/pleroma!776
---

040ab352a543bdaa7ac4c078db0fc24f0db37d5a