Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
2019-04-22 20:40:04 +02:00
2019-01-02 20:48:22 +01:00
…
…
…
…
…
…
2019-02-20 11:57:08 +01:00
…
…
2019-03-30 02:13:42 +01:00
…
2019-04-10 23:32:08 +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?

S
Description
The Wobbl.xyz 'fork' of Mastodon
Readme AGPL-3.0
381 MiB
0 Stars 1 Watchers 0 Forks
Languages
Ruby 45.4%
TypeScript 30.1%
JavaScript 13.8%
SCSS 7.5%
Haml 2.9%
Other 0.2%