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.jsx	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
application.js	Fix missing await (#19273)	2022-10-03 23:08:38 +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
error.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	2020-10-13 01:19:35 +02:00
public-path.js	Move ESLint configs to overrides (#24370)	2023-04-03 12:41:10 +02:00
public.jsx	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
share.jsx	Dont use CommonJS (require, module.exports) anywhere (#24913)	2023-05-09 03:08:47 +02:00