Merge branch 'mastofe/bundle-2020-05-20' into 'develop'
authorlain <lain@soykaf.club>
Wed, 20 May 2020 09:12:35 +0000 (09:12 +0000)
committerlain <lain@soykaf.club>
Wed, 20 May 2020 09:12:35 +0000 (09:12 +0000)
commitc3cfe87c60c1edf046cc4656e7a7704db65a9c85
treefc0eb4278583a08df934c364e0335c02d0b30fec
parent5a149e5788978d919020b81f6d454f1ece9b8983
parentc2dd4639d675df8cff944956677acbd872224acb
Merge branch 'mastofe/bundle-2020-05-20' into 'develop'

MastoFE: update to bundle-2020-05-20

See merge request pleroma/pleroma!2561