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 ad9329502a 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.		3 years ago
..
admin.js	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
auth.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
embed.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
mailer.js	Fixed improper mailer import	7 years ago
public.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
settings.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
theme.yml	Adapt 2FA changes to glitch-soc's theming system	4 years ago
two_factor_authentication.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago