FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
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
…
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00