mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 14:46:52 +09:00
a482932649
Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change. |
||
---|---|---|
.. | ||
.dockerignore | ||
.eslintrc.cjs | ||
Dockerfile | ||
errors.js | ||
index.js | ||
logging.js | ||
metrics.js | ||
package.json | ||
tsconfig.json | ||
utils.js |