mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-12 23:38:20 +00:00
21e7a53ca5
Conflicts: - `package.json`: Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one were changed, but otherwise no real conflict. Ported upstream's changes and kept glitch-soc's `i18n:extract`. - `tsconfig.json`: Upstream's dependencies changed the code style rules for json formatting, and we had local changes. Kept our changes, but with upstream's formatting/ - `yarn.lock`: A dependency textually adjacent to a glitch-soc-only one got changed. Applied upstream's change, keeping the glitch-soc-only dependency.
Mastodon Glitch Edition
Now with automated deploys!
So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?
- You can view documentation for this project at glitch-soc.github.io/docs/.
- And contributing guidelines are available here and here.