Your self-hosted, globally interconnected microblogging community. https://joinmastodon.org/
 
 
 
 
 
Go to file
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
dist
lib
log
nanobox
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
streaming
vendor
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
.gitattributes Add .gitattributes file to avoid unwanted CRLF (#3954) 2017-06-26 13:15:24 +02:00
.gitignore
.gitmodules
.haml-lint.yml Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00
.nanoignore
.nvmrc
.profile Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276) 2017-05-24 17:57:33 +02:00
.rspec
.rubocop.yml
.ruby-version
.scss-lint.yml
.slugignore
.yarnclean
AUTHORS.md
Aptfile Adjust Aptfile for Heroku-18 stack (#8588) 2018-09-09 02:10:58 +02:00
CHANGELOG.md
CODE_OF_CONDUCT.md update code of conduct email address 2017-11-21 11:01:28 -05:00
CONTRIBUTING.md
Capfile
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
LICENSE
Procfile
Procfile.dev
README.md Fix build status link in README.md 2018-09-28 21:18:04 +02:00
Rakefile
Vagrantfile
app.json
babel.config.js
boxfile.yml
config.ru
docker-compose.yml
package.json
postcss.config.js
priv-config
scalingo.json
yarn.lock

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?