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 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2 years ago
..
admin.js	Merge branch 'main' into glitch-soc/merge-upstream	2 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	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
public.js	Merge branch 'main' into glitch-soc/merge-upstream	2 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