Merge branch 'mergeback/2.2.2' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 19 Jan 2021 10:00:15 +0000 (10:00 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 19 Jan 2021 10:00:15 +0000 (10:00 +0000)
commit984426d9c4cadc59017c6770b033f4d72e497342
tree79d2a261bd556390702461ed3f2bb40ba39a143f
parent83ae77ae0cd1b64ca4b5dbd8f92f1d8d58509b3a
parent79bc4bcc3cb89bb5860470626df5f02991b95885
Merge branch 'mergeback/2.2.2' into 'develop'

Mergeback/2.2.2

See merge request pleroma/pleroma!3264