David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -05:00
2018-05-08 13:35:33 +02:00
2018-05-06 10:55:50 +02:00
…
…
2018-05-21 12:43:38 +02:00
2018-06-04 14:49:10 +02:00
2018-04-21 21:36:22 +02:00
…
…
…
…
2018-06-04 14:49:10 +02:00
…
…
…
…
…
…
…
2018-04-21 21:56:40 +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
Languages
Ruby 45.4%
TypeScript 30.1%
JavaScript 13.8%
SCSS 7.5%
Haml 2.9%
Other 0.2%