This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' 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 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
application.js	…
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 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' 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