]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into chore/use-yarn 12030/head
authorDaniel Ruf <827205+DanielRuf@users.noreply.github.com>
Sat, 28 Mar 2020 22:50:49 +0000 (23:50 +0100)
committerGitHub <noreply@github.com>
Sat, 28 Mar 2020 22:50:49 +0000 (23:50 +0100)
1  2 
README.md
package.json

diff --cc README.md
Simple merge
diff --cc package.json
index d56cecf4237ce678a6cb58bf485e810db1fc3998,ff2320653e9fac44a04ad6825fe64953028d2038..c607314cff30841dceab3cc9604356bc6e9b57dc
      "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",