You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 0845bee8d6 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.		3 years ago
..
preview_card_providers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
_preview_card.html.haml	Change languages to be listed under standard instead of native name in admin UI (#17485)	3 years ago
index.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago