mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -05:00
b28ce2424c
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed 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 |