mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-31 06:21:50 +01:00
Claire
f224237862
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.
Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085)
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.
Languages
Ruby
64.4%
JavaScript
16.8%
TypeScript
9.2%
SCSS
4.7%
Haml
4.4%
Other
0.5%