1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-03-02 06:23:47 -05:00
Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
2024-10-05 20:45:05 +02:00
..
2024-05-24 08:36:21 +00:00