Claire 537afa00f3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, glitch-soc-only DM-related method
  too close to changed upstream stuff.
  Ported upstream changes.
- `app/services/batched_remove_status_service.rb`:
  Additional logic in glitch-soc to clear DMs from timelines.
  Ported upstream changes and fixed the DM TL clearing logic.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Additional code in glitch-soc to clear DM timelines.
  Ported upstream changes.
2020-12-23 01:47:45 +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-12-19 00:28:38 +01:00
2020-12-23 01:36:13 +01: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 1.1 GiB
Languages
Ruby 64.4%
JavaScript 17.3%
TypeScript 8.7%
SCSS 4.7%
Haml 4.4%
Other 0.5%