Thibaut Girka 8abcd267f5 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