Merge branch 'mastofe/bundle-2020-01-20' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 29 Feb 2020 16:31:31 +0000 (16:31 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 29 Feb 2020 16:31:31 +0000 (16:31 +0000)
MastoFE: Bundle 2020-01-20

See merge request pleroma/pleroma!2257


Trivial merge