A glitchy but lovable microblogging server
Go to file
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
bin Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
config Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
log
nanobox
public Change error graphic to hover-to-play (#10055) 2019-02-15 23:33:25 +01:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01: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 Upgrade Ruby to 2.6.1 (#9956) 2019-02-20 11:57:08 +01:00
.scss-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md Bump version to 2.7.2 (#10067) 2019-02-17 20:24:12 +01:00
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Bump version to 2.7.4 (#10179) 2019-03-05 18:22:46 +01:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
docker-compose.yml
Dockerfile Re-organize Dockerfile to improve incremental builds. (#10212) 2019-03-08 16:12:48 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01: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?