From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 24 Nov 2020 18:36:50 +0000 (+0100)
Subject: Merge branch 'master' into mfa-meta
X-Git-Tag: 5.4.0_Alpha_1~555^2~30
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=50795fc4defefc7fa893ad7dcbe42406f98cadb0;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into mfa-meta
---

50795fc4defefc7fa893ad7dcbe42406f98cadb0
diff --cc package-lock.json
index 7440f1d2f9,222da74e37..3de9b64483
--- a/package-lock.json
+++ b/package-lock.json
@@@ -1027,13 -1364,11 +1365,16 @@@
        "version": "2.1.1",
        "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
        "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-       "dev": true
+       "dev": true,
+       "engines": {
+         "node": ">=6"
+       }
      },
 +    "node_modules/qr-creator": {
 +      "version": "1.0.0",
 +      "resolved": "https://registry.npmjs.org/qr-creator/-/qr-creator-1.0.0.tgz",
 +      "integrity": "sha512-C0cqfbS1P5hfqN4NhsYsUXePlk9BO+a45bAQ3xLYjBL3bOIFzoVEjs79Fado9u9BPBD3buHi3+vY+C8tHh4qMQ=="
 +    },
      "node_modules/regexpp": {
        "version": "3.1.0",
        "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",