From: kibigo! <marrus-sh@users.noreply.github.com>
Date: Sun, 3 Apr 2022 19:43:27 +0000 (-0700)
Subject: Merge pull request #35 from kibicat/merge_glitch-soc_2022-03-30
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e3398fa05400289400cd5244eeac2ea84328d1f0;p=mastodon.git

Merge pull request #35 from kibicat/merge_glitch-soc_2022-03-30

Merge glitch-soc as of 2022-03-30, to integrate Mastodon 3.5.0
---

e3398fa05400289400cd5244eeac2ea84328d1f0