Merge commit '598ae4f2da' into glitch-soc/merge-upstream

Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.
This commit is contained in:
Claire 2024-07-30 20:47:34 +02:00
commit 1f796d129d
99 changed files with 539 additions and 103 deletions

View file

@ -19,6 +19,7 @@ on:
jobs:
upload-translations:
runs-on: ubuntu-latest
if: github.repository == 'mastodon/mastodon'
steps:
- name: Checkout