help me my masotodon ate a calckey and now it has reactions qts and stuff
Find a file
Thibaut Girka b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
.github Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
bin Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
config Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
dist
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-12-06 12:44:38 +01:00
log
nanobox Update Nginx config for Nanobox apps (#9310) 2018-11-20 22:24:35 +01:00
public
spec Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
streaming Only stream local-only toots to logged-in users 2018-11-13 18:55:57 +01:00
vendor/assets
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant update vagrant configs (#8706) 2018-09-16 14:49:15 -04:00
.eslintignore
.eslintrc.yml
.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
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version
.scss-lint.yml
.slugignore
.yarnclean
app.json
Aptfile
AUTHORS.md Update AUTHORS.md (#9141) 2018-10-29 14:05:53 +01:00
babel.config.js
boxfile.yml
Capfile
CHANGELOG.md Bump version to 2.6.5 (#9413) 2018-12-02 17:41:38 +01:00
CODE_OF_CONDUCT.md update code of conduct email address 2017-11-21 11:01:28 -05:00
config.ru
CONTRIBUTING.md
docker-compose.yml
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-12-06 12:44:38 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
jest.config.js
LICENSE
package.json Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +01:00
priv-config
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
stack-fix.c
Vagrantfile Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
yarn.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +01: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?