Merge branch 'master' into dev

4 years ago · fb5299faad
parent 714ea5b618 f4717b35a3
commit fb5299faad
2 changed files with 3 additions and 3 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -2546,8 +2546,8 @@
      }
    },
    "express-fileupload": {
-      "version": "git+https://gitgud.io/fatchan/express-fileupload.git#bc42b96620ffc8caeb513ca7a7815781a0b984c8",
-      "from": "git+https://gitgud.io/fatchan/express-fileupload.git",
+      "version": "git+https://gitgud.io/fatchan/express-fileupload.git#64cf8d7afc13428bb02a1d158fb2b522cb29f134",
+      "from": "git+https://gitgud.io/fatchan/express-fileupload.git#64cf8d7afc13428bb02a1d158fb2b522cb29f134",
      "requires": {
        "busboy": "^0.3.1"
      }
--- a/package.json
+++ b/package.json
@ -15,7 +15,7 @@
    "del": "^5.1.0",
    "dnsbl": "^3.2.0",
    "express": "^4.17.1",
-    "express-fileupload": "git+https://gitgud.io/fatchan/express-fileupload.git",
+    "express-fileupload": "git+https://gitgud.io/fatchan/express-fileupload.git#64cf8d7afc13428bb02a1d158fb2b522cb29f134",
    "express-session": "^1.17.0",
    "fluent-ffmpeg": "^2.1.2",
    "fs": "0.0.1-security",