Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes.		2022-03-02 20:48:27 +01:00
..
preview_card_providers	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 20:48:27 +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	2022-03-02 20:48:27 +01:00