mirror of https://github.com/tootsuite/mastodon
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. |
||
|---|---|---|
| .. | ||
| _account.html.haml | ||
| show.html.haml | ||