Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
admin.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
auth.js
common.js
embed.js
mailer.js
public.js
settings.js
theme.yml
two_factor_authentication.js