mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 06:36:45 +00:00
1cd7f5ff17
Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules. |
||
---|---|---|
.. | ||
babel.js | ||
css.js | ||
file.js | ||
index.js | ||
mark.js | ||
node_modules.js | ||
tesseract.js |