Merge branch 'mastofe/bundle-2020-01-22' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 22 Jan 2020 15:06:26 +0000 (15:06 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 22 Jan 2020 15:06:26 +0000 (15:06 +0000)
commit15db18af691f91ae7c834aa65f4b4d11d1c32d4c
tree18dc95fc42f2fc274890195bf4d745ea45be5b54
parent34aa0c542bd0d2e84829146d26bc573320d54a4f
parentbd3f3756fbc2e30948bd4c7857efb94314c0eff0
Merge branch 'mastofe/bundle-2020-01-22' into 'develop'

Update MastoFE bundle to 2020-01-22

See merge request pleroma/pleroma!2127