mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 04:03:06 -05:00
Claire
dc68306b8e
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/layouts/application.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code. - `app/views/layouts/embedded.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
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%