Claire 7b09f585fa Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Upstream refactored slightly (but touching almost all the lines in the code), glitch-soc had moved a few of the code to another file. Refactored as upstream did.		2023-08-24 20:34:14 +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 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream	2023-08-24 20:34:14 +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