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 fa16de4a4e Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' 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.		1 year ago
..
admin.js	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago
auth.js	…
common.js	…
embed.js	…
mailer.js	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream	2 years ago
public.js	[Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere	2 years ago
settings.js	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago
theme.yml	[Glitch] Add polling and automatic redirection to `/start` on email confirmation	2 years ago
two_factor_authentication.js	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago