Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
preview_card_providers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +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-02-26 09:29:23 +01:00