mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 00:21:40 +01:00
Thibaut Girka
5085559b15
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
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
17.3%
TypeScript
8.7%
SCSS
4.7%
Haml
4.4%
Other
0.5%