David Yip 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
2017-12-03 23:26:40 -08:00
2018-01-19 20:53:30 +01:00
2017-11-17 19:29:17 -08: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
No description provided
Readme AGPL-3.0 244 MiB
Languages
Ruby 46.6%
JavaScript 36.5%
SCSS 10.9%
Haml 3.7%
TypeScript 2%
Other 0.2%