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)
commit4cf03046f5d5080ecfff8677006a03bb7ce84efb
tree8eadd14db60b346d2b34230fc12ce12d37a511f0
parent6efbd088546d7b95126b3100bca57b41e9482211
parent5660bee2dcfd200c726c7d7ce40b1f6b8d5048f2
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch