From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 10 Apr 2018 14:46:04 +0000 (+0000)
Subject: Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d7654f4b3c3d2ee709febbd91207c0757638f23e;p=akkoma

Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'

Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec

See merge request pleroma/pleroma!104
---

d7654f4b3c3d2ee709febbd91207c0757638f23e