mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 03:32:56 -05:00
abcba5c198
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.