mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 22:57:05 +09:00
3cac826382
Conflicts: - `streaming/index.js`: Upstream significantly refactored that file, while one modified function had a different signature because of support for local-only posts. Ported upstream's change and kept the local-only support. - `yarn.lock`: Upstream added new dependencies, one of which was textually close to a glitch-soc-only dependency. Updated accordingly. |
||
---|---|---|
.. | ||
.dockerignore | ||
.eslintrc.js | ||
Dockerfile | ||
index.js | ||
logging.js | ||
metrics.js | ||
package.json | ||
tsconfig.json | ||
utils.js |