You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views/relationships
Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream
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.
5 years ago
..
_account.html.haml Add interrelationship icon (#15149) 5 years ago
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 5 years ago