Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +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

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 427 MiB
Languages
Ruby 48.9%
TypeScript 24%
JavaScript 17.1%
SCSS 6.5%
Haml 3.2%
Other 0.3%