Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`. |
||
|---|---|---|
| .. | ||
| .dockerignore | ||
| .eslintrc.js | ||
| Dockerfile | ||
| index.js | ||
| metrics.js | ||
| package.json | ||
| tsconfig.json | ||
| utils.js | ||