Merge branch 'mergeback/2.2.1' into 'develop'
authorlain <lain@soykaf.club>
Wed, 23 Dec 2020 14:08:08 +0000 (14:08 +0000)
committerlain <lain@soykaf.club>
Wed, 23 Dec 2020 14:08:08 +0000 (14:08 +0000)
commitce1be8f5e6feabee4acac376dce23f0ec18e62ec
tree77a15bc9f7c0e1e5c2ae3db99a5ec81ed22d60bc
parentc5cce89f501d920591170c0348cc427b1cc58ece
parentae934659d1ade1b5c5c4ab13aae5a56246cce3a5
Merge branch 'mergeback/2.2.1' into 'develop'

Mergeback/2.2.1

See merge request pleroma/pleroma!3215