From: lambda <pleromagit@rogerbraun.net>
Date: Wed, 11 Apr 2018 20:58:25 +0000 (+0000)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3d636cf533e7e73f35d1837bcc70e8d9f4306b37;p=akkoma

Merge branch 'develop' into 'develop'

Fix issue #124

Closes #124

See merge request pleroma/pleroma!108
---

3d636cf533e7e73f35d1837bcc70e8d9f4306b37