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 6ee3e382df Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Some of the removed dead code was split from this code in `app/javascript/core/public.js` and `app/javascript/core/settings.js`. Removed this dead code, and removed `app/javascript/core/public.js` altogether.		1 year ago
..
admin.js	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	1 year ago
auth.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
embed.js	[Glitch] Run eslint --fix	2 years ago
mailer.js	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2 years ago
remote_interaction_helper.ts	Fix interaction modal being broken because of glitch-soc's theming system	1 year ago
settings.js	Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream	1 year ago
theme.yml	Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream	1 year ago
two_factor_authentication.js	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	1 year ago