A glitchy but lovable microblogging server
Go to file
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +02:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
db
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
log
nanobox
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
streaming
vendor/assets
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.yml
.foreman
.gitattributes
.gitignore
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version
.scss-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md
babel.config.js
boxfile.yml
Capfile
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
docker-compose.yml
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
jest.config.js
LICENSE
package.json
priv-config
Procfile
Procfile.dev
Rakefile
README.md Fix build status link in README.md 2018-09-28 21:18:04 +02:00
scalingo.json
stack-fix.c
Vagrantfile
yarn.lock

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?