Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there.		2023-08-24 21:01:19 +02:00
..
admin.js
auth.js
common.js
embed.js
mailer.js
public.js
remote_interaction_helper.ts
settings.js	Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00
theme.yml
two_factor_authentication.js