mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2025-05-29 08:21:51 +02:00
Conflicts: - `app/models/user_settings.rb`: Not a real conflict, upstream added a setting on a line adjacent to a glitch-soc-only line. Added upstream's new setting. |
||
---|---|---|
.. | ||
.dockerignore | ||
database.js | ||
Dockerfile | ||
errors.js | ||
eslint.config.mjs | ||
index.js | ||
lint-staged.config.mjs | ||
logging.js | ||
metrics.js | ||
package.json | ||
redis.js | ||
tsconfig.json | ||
utils.js |