From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 2 Apr 2018 17:05:02 +0000 (+0000)
Subject: Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=925fb2f8717c1d7aa9be03be96fcaaed54a9f839;p=akkoma

Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'

Bring mastofe up to date

See merge request pleroma/pleroma!93
---

925fb2f8717c1d7aa9be03be96fcaaed54a9f839