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 | ||