Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
2020-12-05 17:33:37 +01:00
2020-03-08 16:04:25 +01: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
2020-01-21 12:42:13 +01:00
2016-02-25 00:17:01 +01:00
2020-11-19 17:46:46 +01:00
2019-06-06 18:51:46 +02:00
2017-07-27 22:30:27 +02:00
2020-07-22 23:08:27 +02:00
2019-09-14 11:40:13 +02:00
2020-11-29 09:20:02 +01:00
2020-04-27 17:19:53 +02:00
2018-06-26 20:34:12 +02:00
2018-03-12 03:50:40 +01:00
2016-02-20 22:53:20 +01:00
2020-06-03 08:32:23 +02:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status

So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?

Description
No description provided
Readme AGPL-3.0 950 MiB
Languages
Ruby 64.4%
JavaScript 16.8%
TypeScript 9.2%
SCSS 4.7%
Haml 4.4%
Other 0.5%