mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-15 23:23:50 -05:00
Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.