mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-31 20:12:55 -05:00
3cac826382
Conflicts: - `streaming/index.js`: Upstream significantly refactored that file, while one modified function had a different signature because of support for local-only posts. Ported upstream's change and kept the local-only support. - `yarn.lock`: Upstream added new dependencies, one of which was textually close to a glitch-soc-only dependency. Updated accordingly.