From: rinpatch <rinpatch@sdf.org>
Date: Wed, 26 Jun 2019 19:15:37 +0000 (+0000)
Subject: Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cfb5be3cedcd0e486851ebaf2b3abb4b838fc909;p=akkoma

Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'

Update mastofe to bundle-2019-06-26

See merge request pleroma/pleroma!1341
---

cfb5be3cedcd0e486851ebaf2b3abb4b838fc909