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)
commit0fefc4033fb61f927ca8e6357d5773c37e999767
treec608dac42eebd933791dec52ca73aa043073d3e7
parent5db2fb3ce7d45958dd657828b36c2d5b9e521d90
parent2a850abbeb70f988e5e78bcd2c6bec42b1b6282c
Merge branch 'mastofe/bundle-2020-01-20' into 'develop'

MastoFE: Bundle 2020-01-20

See merge request pleroma/pleroma!2257