Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.

2020-01-20 18:31:11 +01:00

..

_account.html.haml

Add relationship manager UI (#10268)

2019-03-16 11:23:22 +01:00

show.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-20 18:31:11 +01:00