The glaceon.social flavour of glitch-soc, a Mastodon fork
Go to file
Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
.circleci
…
.dependabot
…
.github Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
app Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
bin
…
config Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
dist
…
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
log
…
nanobox
…
public
…
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
streaming
…
vendor
…
.buildpacks
…
.codeclimate.yml
…
.dockerignore
…
.editorconfig
…
.env.nanobox Various updates for Nanobox deploys (#11988) 2019-10-02 00:25:25 +02:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
.env.test
…
.env.vagrant fix vagrant connection error (#12180) 2019-10-24 22:47:24 +02:00
.eslintignore
…
.eslintrc.js
…
.foreman
…
.gitattributes
…
.gitignore Update .gitignore (#12287) 2019-11-04 12:54:08 +01:00
.gitmodules
…
.haml-lint.yml
…
.nanoignore
…
.nvmrc
…
.profile
…
.rspec
…
.rubocop.yml
…
.ruby-version Use Ruby 2.6.5 (#12049) 2019-10-02 04:54:32 +02:00
.sass-lint.yml
…
.slugignore
…
.yarnclean
…
AUTHORS.md Update AUTHORS.md (#12096) 2019-10-07 04:36:32 +02:00
Aptfile
…
CHANGELOG.md Update changelog for 3.0.1 (#12139) 2019-10-10 07:03:05 +02:00
CODE_OF_CONDUCT.md
…
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
Capfile
…
Dockerfile Dockerfile: put back EXPOSE directive (#12279) 2019-11-04 12:56:21 +01:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
LICENSE
…
Procfile
…
Procfile.dev
…
README.md Update README.md (#12164) 2019-10-24 22:48:21 +02:00
Rakefile
…
Vagrantfile
…
app.json
…
babel.config.js
…
boxfile.yml Various updates for Nanobox deploys (#11988) 2019-10-02 00:25:25 +02:00
config.ru
…
crowdin.yml
…
docker-compose.yml
…
package.json Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
postcss.config.js
…
priv-config
…
scalingo.json
…
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01: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?