mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-01 04:22:57 -05:00
1f796d129d
Conflicts: - `config/routes/api.rb`: Upstream added an endpoint, textually close to a glitch-soc-only endpoint. Ported upstream changes.