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.jsx	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	1 year ago
application.js	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
error.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
public-path.js	Move ESLint configs to overrides (#24370)	2 years ago
public.jsx	Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream	1 year ago
share.jsx	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
sign_up.js	Add client-side timeout on resend confirmation button (#26300)	1 year ago