Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
2019-08-30 07:42:50 +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
2019-10-02 04:54:32 +02:00
2019-06-06 18:51:46 +02:00
2017-07-27 22:30:27 +02:00
2019-10-07 04:36:32 +02:00
2019-09-14 11:40:13 +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
2019-10-24 22:48:21 +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%