mirror of https://github.com/glitch-soc/mastodon
![]() Conflicts: - `app/javascript/styles/mastodon/components.scss`: Upstream removed some code that somehow had been modified in glitch-soc. Removed it as upstream did. |
||
---|---|---|
.. | ||
babel.js | ||
css.js | ||
file.js | ||
index.js | ||
mark.js | ||
material_icons.js | ||
tesseract.js |