mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 08:34:13 -05:00
b8209c3b96
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now. |
||
---|---|---|
.. | ||
.dockerignore | ||
.eslintrc.js | ||
Dockerfile | ||
index.js | ||
metrics.js | ||
package.json | ||
tsconfig.json | ||
utils.js |