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
application.js
common.js
error.js
public-path.js
public.jsx	Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream	2023-05-09 23:12:48 +02:00
share.jsx