mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-14 22:53:53 -05:00
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.