mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-27 18:13:12 -05:00
Claire
93912f0498
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
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
25.9%
TypeScript
13.7%
SCSS
7.6%
Haml
3.4%
Other
0.4%