Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
2018-09-16 14:49:15 -04:00
2019-02-20 11:57:08 +01:00
2019-06-06 18:51:46 +02:00
2019-03-30 02:13:42 +01:00
2019-06-12 15:11:00 +02:00
2018-06-26 20:34:12 +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
A glitchy but lovable microblogging server
Readme AGPL-3.0 420 MiB
Languages
Ruby 49%
TypeScript 23.8%
JavaScript 17.2%
SCSS 6.5%
Haml 3.2%
Other 0.3%