Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
authorLain Soykaf <lain@lain.com>
Sun, 26 Dec 2021 15:57:17 +0000 (16:57 +0100)
committerLain Soykaf <lain@lain.com>
Sun, 26 Dec 2021 15:57:17 +0000 (16:57 +0100)

Trivial merge