A glitchy but lovable microblogging server
Go to file
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
.circleci
.dependabot
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
db
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
log
nanobox
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
streaming
vendor
.buildpacks Add ffmpeg buildpack for scalingo (#8500) 2018-08-29 01:21:23 +02:00
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
.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
app.json
Aptfile
AUTHORS.md
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Fix unconverted PRs in the changelog (#11155) 2019-06-22 18:13:52 +02:00
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
crowdin.yml
docker-compose.yml
Dockerfile
Gemfile
Gemfile.lock
LICENSE
package.json
postcss.config.js
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
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?