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.		2023-09-02 13:18:16 +02:00
..
admin.jsx	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
application.js	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	2023-06-02 15:00:27 +02:00
common.js	…
error.js	…
public-path.js	Move ESLint configs to overrides (#24370)	2023-04-03 12:41:10 +02:00
public.jsx	Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream	2023-09-02 13:18:16 +02:00
share.jsx	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	2023-06-02 15:00:27 +02:00
sign_up.js	Add client-side timeout on resend confirmation button (#26300)	2023-08-03 01:51:10 +02:00