mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-28 10:33:07 -05:00
2cfa142961
Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.