mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 13:03:43 +01:00
08b10cce52
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. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web |