Commit Graph

1 Commits

Author SHA1 Message Date
Misty De Méo 3c9599f19a
Upstream backports (#1343)
This backports the commits from the upstream `stable-4.0` branch,
including the security content of
[4.2.6](https://github.com/mastodon/mastodon/releases/tag/v4.2.6).

---------

Co-authored-by: blah <blah@blah>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 10:31:19 -08:00