mirror of
https://github.com/glitch-soc/mastodon
synced 2025-04-24 21:14:51 +00:00
Conflicts: - `app/javascript/styles/mastodon/components.scss`: Upstream removed some code that somehow had been modified in glitch-soc. Removed it as upstream did. |
||
---|---|---|
.. | ||
.dockerignore | ||
.eslintrc.cjs | ||
database.js | ||
Dockerfile | ||
errors.js | ||
index.js | ||
logging.js | ||
metrics.js | ||
package.json | ||
redis.js | ||
tsconfig.json | ||
utils.js |