A fork of glitch-soc.

Go to file

Thibaut Girka 032a669622 Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/admin/settings/edit.html.haml Conflict on theme VS flavour/skin handling. Keep our version.		2019-06-19 18:49:25 +02:00
.circleci	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-16 21:09:19 +02:00
.dependabot	…
.github	…
app	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00
bin	…
config	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:49:25 +02:00
db	…
dist	…
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-13 22:23:20 +02:00
log	…
nanobox	Resync Nanobox files with the 2.9.0 release (#11083 )	2019-06-14 14:52:31 +02:00
public	…
spec	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00
streaming	Fix streaming server crashing when updating filters	2019-06-18 16:50:04 +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	Bump version to 2.9.0 (#11074 )	2019-06-13 20:19:21 +02:00
CODE_OF_CONDUCT.md	…
CONTRIBUTING.md	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-16 21:09:19 +02:00
Capfile	…
Dockerfile	…
Gemfile	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00
Gemfile.lock	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00
LICENSE	…
Procfile	…
Procfile.dev	…
README.md	…
Rakefile	…
Vagrantfile	…
app.json	…
babel.config.js	New Crowdin translations (#11077 )	2019-06-18 22:58:18 +02:00
boxfile.yml	Resync Nanobox files with the 2.9.0 release (#11083 )	2019-06-14 14:52:31 +02:00
config.ru	…
crowdin.yml	…
docker-compose.yml	…
package.json	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00
postcss.config.js	…
priv-config	…
scalingo.json	…
yarn.lock	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-19 18:36:16 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

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?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.