mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 06:33:05 -05:00
a5127d0ef8
Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.