Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| .dockerignore | ||
| .eslintrc.cjs | ||
| Dockerfile | ||
| errors.js | ||
| index.js | ||
| logging.js | ||
| metrics.js | ||
| package.json | ||
| tsconfig.json | ||
| utils.js | ||