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
..
preview_card_providers	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
_preview_card.html.haml	Change languages to be listed under standard instead of native name in admin UI (#17485)	2022-02-09 04:15:38 +01:00
index.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00