mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-26 10:04:20 -05:00
b474cbbd28
Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web |