Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did. |
||
|---|---|---|
| .. | ||
| .dockerignore | ||
| .eslintrc.cjs | ||
| Dockerfile | ||
| database.js | ||
| errors.js | ||
| index.js | ||
| logging.js | ||
| metrics.js | ||
| package.json | ||
| redis.js | ||
| tsconfig.json | ||
| utils.js | ||