Merge branch 'develop' into 'develop'
authorfeld <feld@feld.me>
Tue, 8 Sep 2020 14:52:51 +0000 (14:52 +0000)
committerfeld <feld@feld.me>
Tue, 8 Sep 2020 14:52:51 +0000 (14:52 +0000)
commitbf048ab72f3b0a994b5d8dd6c82bf30780468173
treef7eb78db5059aea2e39e49e80ebedf2a88cc483f
parent9e49f4627fd0346cf88d44c4ab8c46c740aab36e
parentbb0d7b7aaad4f441a14c94c56081ec30c96ea799
Merge branch 'develop' into 'develop'

ForceBotUnlistedPolicy

See merge request pleroma/pleroma!2967