Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 26 Jun 2019 19:15:37 +0000 (19:15 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 26 Jun 2019 19:15:37 +0000 (19:15 +0000)
Update mastofe to bundle-2019-06-26

See merge request pleroma/pleroma!1341


Trivial merge