Claire 1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.		2023-05-09 23:12:48 +02:00
..
admin.jsx	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
application.js	Rework polyfills loading (#24907)	2023-05-09 14:55:35 +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 '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream	2023-05-09 23:12:48 +02:00
share.jsx	Rework polyfills loading (#24907)	2023-05-09 14:55:35 +02:00