mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 04:03:06 -05:00
Claire
aa832d623a
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.
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.
Description
Languages
Ruby
49%
JavaScript
26.4%
TypeScript
13.2%
SCSS
7.7%
Haml
3.4%
Other
0.3%