mirror of
https://github.com/mastodon/mastodon.git
synced 2025-03-17 12:50:25 +01:00
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. |
||
---|---|---|
.. | ||
_account.html.haml | ||
show.html.haml |