Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2022-10-30 18:15:28 +01:00
2021-03-24 10:44:31 +01:00
2022-10-29 15:06:23 +02:00
2016-02-20 22:53:20 +01:00
2017-12-03 23:26:40 -08:00
2017-07-27 22:30:27 +02:00
2016-02-25 00:17:01 +01:00
2017-07-27 22:30:27 +02:00
2022-02-14 16:08:02 +01:00
2022-03-15 08:16:45 +01:00
2022-10-28 00:26:02 +02:00
2021-11-23 00:15:31 +01:00
2020-04-27 17:19:53 +02:00
2018-06-26 20:34:12 +02:00
2016-02-20 22:53:20 +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
A glitchy but lovable microblogging server
https://toot-lab.reclaim.technology/
Readme AGPL-3.0
Languages
Ruby 49%
JavaScript 26.4%
TypeScript 13.2%
SCSS 7.7%
Haml 3.4%
Other 0.3%