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)
commitcfb5be3cedcd0e486851ebaf2b3abb4b838fc909
tree39253eb09c03eb92856bbf1a74666e67f82e3dc0
parent145bcf3eb9613f4673979ddce79455082398ae35
parent451931d36fcf0bd953ce18d027a4fe4d7b354bc9
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'

Update mastofe to bundle-2019-06-26

See merge request pleroma/pleroma!1341