fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 03:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/relationships
History
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.
2020-11-12 22:13:57 +01:00
..
_account.html.haml Add interrelationship icon (#15149) 2020-11-12 17:43:12 +01:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00