Claire 29b5c5f483 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.
2021-09-30 00:01:20 +02:00
2021-03-24 10:44:31 +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
2016-02-25 00:17:01 +01:00
2021-07-10 01:29:27 +02:00
2019-06-06 18:51:46 +02:00
2017-07-27 22:30:27 +02:00
2021-01-22 10:09:40 +01:00
2019-09-14 11:40:13 +02:00
2021-09-13 19:03:14 +02:00
2020-04-27 17:19:53 +02:00
2018-06-26 20:34:12 +02:00
2016-02-20 22:53:20 +01:00
2021-05-16 23:50:16 +02:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

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%