Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
admin.js	Add confirmation page when importing blocked domains (#1773)	2022-05-16 18:26:49 +02:00
auth.js
common.js
embed.js
mailer.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
public.js
settings.js
theme.yml
two_factor_authentication.js