mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-12 13:43:50 -05:00
Conflicts: - `spec/controllers/api/v1/accounts/credentials_controller_spec.rb` Conflict due to glitch-soc's different note length handling. Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.