Merge upstream changes up to c8b9e60ec123c458efff83eedcfd07f067ef05ae - Githubissues

glitch-soc / mastodon

A glitchy but lovable microblogging server

https://glitch-soc.github.io/docs/

GNU Affero General Public License v3.0

708 stars 182 forks source link

Merge upstream changes up to c8b9e60ec123c458efff83eedcfd07f067ef05ae #2806

Closed ClearlyClaire closed 3 months ago

ClearlyClaire commented 3 months ago

No conflicts

Ported changes

19f4aa11472eb5bedd97e0541a48126078715193
3d6e8d68344cb6b8604d2321705c83f2eebf8add
b6c1b8f7480d87340a128c593ad267e4b5501beb
315308b10cf1d6431053c1553a2f0b596471f039
c01a6a6eeb055c594df9b846d60afe05465b56f3
97b9e8befd7355af7a2a2905a16f5f0527f0b48c
103e544cfaadd33f33369cf6e8496accbebc3906
57a1f86626ad00f12ccf055c4f0e0ade506b8fba
30430a62e2a049c924ba33273b9c3c90178a0eb8
c8b9e60ec123c458efff83eedcfd07f067ef05ae