Your self-hosted, globally interconnected microblogging community
Go to file
Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/themes.yml

Removed config/themes.yml, took upstream's mastodon-light.scss
2018-05-25 18:59:02 +02:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-master 2018-05-25 18:59:02 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-master 2018-05-25 18:59:02 +02:00
db
docs
lib
log
nanobox
public
spec
streaming
vendor/assets
.babelrc
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.yml
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version
.scss-lint.yml
.slugignore
.travis.yml
.yarnclean
app.json
Aptfile
AUTHORS.md
boxfile.yml
Capfile
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
docker-compose.yml
Dockerfile
Gemfile
Gemfile.lock
jest.config.js
LICENSE
package.json
Procfile
Procfile.dev
Rakefile
README.md
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?