Your self-hosted, globally interconnected microblogging community. https://joinmastodon.org/
 
 
 
 
 
Go to file
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
.circleci
.dependabot
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
log
nanobox
public Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
vendor
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml
.ruby-version
.sass-lint.yml
.slugignore
.yarnclean
AUTHORS.md
Aptfile
CHANGELOG.md
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Capfile
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
LICENSE
Procfile
Procfile.dev
README.md
Rakefile
Vagrantfile
app.json
babel.config.js Fix tesseract.js being part of the common chunk (#11571) 2019-08-15 17:24:45 +02:00
boxfile.yml
config.ru
crowdin.yml
docker-compose.yml
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
postcss.config.js
priv-config
scalingo.json
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00

README.md

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?