mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
8142bd2553
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
|---|---|---|
| .circleci | ||
| .github | ||
| app | ||
| bin | ||
| config | ||
| db | ||
| docs | ||
| lib | ||
| log | ||
| nanobox | ||
| public | ||
| spec | ||
| streaming | ||
| vendor/assets | ||
| .babelrc | ||
| .buildpacks | ||
| .codeclimate.yml | ||
| .dockerignore | ||
| .editorconfig | ||
| .env.nanobox | ||
| .env.production.sample | ||
| .env.test | ||
| .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 | ||
| .yarnclean | ||
| app.json | ||
| Aptfile | ||
| AUTHORS.md | ||
| boxfile.yml | ||
| Capfile | ||
| CODE_OF_CONDUCT.md | ||
| config.ru | ||
| CONTRIBUTING.md | ||
| docker-compose.yml | ||
| Dockerfile | ||
| Gemfile | ||
| Gemfile.lock | ||
| jest.config.js | ||
| LICENSE | ||
| package.json | ||
| Procfile | ||
| Procfile.dev | ||
| Rakefile | ||
| README.md | ||
| scalingo.json | ||
| stack-fix.c | ||
| Vagrantfile | ||
| yarn.lock | ||
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.