You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
development.rb	Fix warnings on Rails boot (#16946)	3 years ago
production.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
test.rb	Misc. typos (#8694)	6 years ago