mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-08 07:52:12 -05:00
Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did.