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.
2022-11-12 13:28:03 +01:00
2021-03-24 10:44:31 +01:00
2022-11-09 04:12:57 +01:00
2022-11-10 19:09:54 +01:00
2022-11-05 22:57:58 +01:00
2022-03-15 08:16:45 +01:00
2022-11-11 08:39:38 +01:00
2021-11-23 00:15:31 +01:00
2020-04-27 17:19:53 +02: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?

S
Description
No description provided
Readme AGPL-3.0 244 MiB
Languages
Ruby 46.6%
JavaScript 36.5%
SCSS 10.9%
Haml 3.7%
TypeScript 2%
Other 0.2%