From: lambda <pleromagit@rogerbraun.net>
Date: Sun, 1 Apr 2018 09:51:34 +0000 (+0000)
Subject: Merge branch 'mastofe-f48f11d4' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7130e9ddb16286efd7d01088e816f05e82cfa2a1;p=akkoma

Merge branch 'mastofe-f48f11d4' into 'develop'

update mastofe

See merge request pleroma/pleroma!90
---

7130e9ddb16286efd7d01088e816f05e82cfa2a1