Merge branch 'master' of https://github.com/rishighan/threetwo

# Conflicts: # package.json # src/server/route/routes/importComics.routes.ts
2021-05-07 08:58:53 -07:00
parent f0ae9e9275 284433696e
commit c7ac6e5979
4 changed files with 460 additions and 59 deletions
--- a/package.json
+++ b/package.json
@@ -30,11 +30,11 @@
    "highland": "^2.13.5",
    "imghash": "^0.0.8",
    "mongoose": "^5.10.11",
+    "oboe": "^2.1.5",
    "react": "^17.0.1",
    "react-dom": "^17.0.1",
    "react-hooks-worker": "^1.0.0",
-    "sharp": "^0.28.1",
-    "streammagic": "^1.0.0"
+    "sharp": "^0.28.1"
  },
  "devDependencies": {
    "@babel/cli": "^7.13.10",