2aaf3528ca
Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes. |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles | ||
types |