Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
2022-11-09 04:12:57 +01:00
2023-02-15 08:30:27 +01:00
2022-11-14 08:33:24 +01:00
2023-02-15 08:30:27 +01:00
2021-11-23 00:15:31 +01:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

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?

Description
The Wobbl.xyz 'fork' of Mastodon
Readme AGPL-3.0 319 MiB
Languages
Ruby 47.6%
JavaScript 23.7%
TypeScript 14.7%
SCSS 8.8%
Haml 3.2%
Other 2%