queer.af mastodon fork
Go to file
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
.circleci Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447) 2018-05-11 11:51:07 +02:00
.github Multiple Issue templates (#7402) 2018-05-08 13:35:33 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2018-05-16 21:52:38 +02:00
bin Port travis_retry for CI (#7379) 2018-05-06 10:55:50 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2018-05-16 21:52:38 +02:00
db Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
docs
lib Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
log
nanobox
public
spec Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
streaming Direct messages column (#4514) 2018-04-18 13:09:06 +02:00
vendor/assets
.babelrc
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
.env.test Add parallel test processors (#7215) 2018-04-21 21:36:22 +02:00
.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 Replace Travis to CircleCI (#7196) 2018-04-20 13:46:08 +02:00
.yarnclean
app.json
Aptfile
AUTHORS.md
boxfile.yml
Capfile
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md Merge remote-tracking branch 'origin/master' into gs-master 2018-05-04 12:16:12 -05:00
docker-compose.yml docker-compose: Only bind ports 3000 and 4000 on localhost. (#7138) 2018-04-15 13:57:58 +02:00
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-05-16 21:52:38 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-05-16 21:52:38 +02:00
jest.config.js
LICENSE
package.json Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
Procfile
Procfile.dev
Rakefile
README.md Replace badge to CircleCI (#7216) 2018-04-21 21:56:40 +02:00
scalingo.json
stack-fix.c
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02: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?