Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1

This commit is contained in:
lain 2020-12-23 11:40:34 +01:00
commit 5ada38499b
1 changed files with 3 additions and 3 deletions