Claire 1cd7f5ff17 Merge commit 'd27216dc46' into glitch-soc/merge-upstream ... Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules.		2023-05-28 15:54:31 +02:00
..
admin.js	Merge commit 'd27216dc46' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
auth.js
common.js
embed.js
mailer.js	Merge commit 'c8181eb0a4' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
public.js	[Glitch] Dont use CommonJS (require, module.exports) anywhere	2023-05-09 22:28:53 +02:00
settings.js	Merge commit 'd27216dc46' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
theme.yml	[Glitch] Add polling and automatic redirection to /start on email confirmation	2023-05-25 22:37:14 +02:00
two_factor_authentication.js	Merge commit 'd27216dc46' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00