mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-23 16:13:15 -05:00
66ad30db48
Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.