mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 08:31:44 +01:00
c077cdaba7
Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.