Claire 5c4a012ac5 Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did.		2023-05-09 22:12:05 +02:00
..
admin.js	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
auth.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
embed.js	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
mailer.js	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
public.js	Fix some more Javascript linting issues and discrepancies with upstream (#2209)	2023-05-07 21:43:25 +02:00
settings.js	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
theme.yml	Adapt 2FA changes to glitch-soc's theming system	2020-08-30 17:26:18 +02:00
two_factor_authentication.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00