From: Daniel Ruf <827205+DanielRuf@users.noreply.github.com>
Date: Sat, 28 Mar 2020 22:50:49 +0000 (+0100)
Subject: Merge branch 'develop' into chore/use-yarn
X-Git-Tag: v6.6.3^2~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9dbf29b7263fb42ebef5f33e66bb269b4b2fb4d;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into chore/use-yarn
---

a9dbf29b7263fb42ebef5f33e66bb269b4b2fb4d
diff --cc package.json
index d56cecf42,ff2320653..c607314cf
--- a/package.json
+++ b/package.json
@@@ -79,8 -85,10 +84,9 @@@
      "mocha": "^5.0.5",
      "mocha-headless-chrome": "^2.0.1",
      "motion-ui": "^2.0.2",
 -    "npm-force-resolutions": "0.0.2",
      "octophant": "^1.0.0",
      "panini": "^1.6.2",
+     "patch-package": "^6.2.1",
      "prettyjson": "^1.1.3",
      "require-dir": "^1.2.0",
      "requirejs": "^2.3.6",