Claire 2136aa2759 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: We have completely different contents. Kept our version. - `package.json`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `streaming/index.js`: Conflict due to code style changes on parts that were modified in glitch-soc to handle local-only toots. Changed style according to upstream.		2021-12-27 15:16:18 +01:00
..
index.js	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-27 15:16:18 +01:00