Merge upstream changes up to 28411acebb5626acf43b44a7b6c33ac783156f72 - 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 28411acebb5626acf43b44a7b6c33ac783156f72 #2809

Closed ClearlyClaire closed 3 months ago

ClearlyClaire commented 3 months ago

Fixes #2799

This one is a big one!

Merge upstream changes up to 658addcbf783f6baa922d11c9524ebb9ddbcbc59

Ported changes

664bef35730542791c44c739b8f39e37d7baddd3
389549e7838291f09bc291c7559730fe3f2aad58
2095d0f2b08c52a39380bb8b303851e475c6b3a7
6ca731e9b69962a0023df2c5314562293bb4b6b6
9538d9c298ed98127e3ba297a1933608976b1906
170157570447d30732445f6339b0c7b2fe7617d8
658addcbf783f6baa922d11c9524ebb9ddbcbc59

Merge upstream changes up to 28411acebb5626acf43b44a7b6c33ac783156f72

bcec8f53a48cc3892bd646ca7960b30edc402dcf
28411acebb5626acf43b44a7b6c33ac783156f72