Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		2022-02-09 17:28:33 +01:00
..
links	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 01:15:32 +01:00