mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-31 06:21:50 +01:00
Thibaut Girka
7b435fd9bf
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Mastodon Glitch Edition
Now with automated deploys!
So here's the deal: we all work on this code, and then it runs on dev.glitch.social 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%