mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 00:54:02 -05:00
0b2c7cdb02
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 |