Merge pull request #1772 from pwa-builder/dev

Merging dev into master
pwa-builder · Jun 4, 2021 · 81c566d · 81c566d
2 parents 1bc9979 + 8a4d359
commit 81c566d
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 146 deletions.
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "dont-sniff-mimetype": "^1.1.0",
     "downloadjs": "^1.4.7",
     "highlight.js": "^9.15.6",
+    "lodash.merge": "^4.6.2",
     "manup": "^1.0.1",
     "marked": "0.7.0",
     "monaco-editor": "^0.17.0",

diff --git a/static/manifest.webmanifest b/static/manifest.webmanifest
@@ -88,13 +88,6 @@
       "label": "Each web platform article comes with code samples, live demo, browser support matrix, and more",
       "platform": "wide"
     },
-    {
-      "src": "/Images/assets/screenShots/06-demo-desktop.png",
-      "sizes": "1920x1200",
-      "type": "image/png",
-      "label": "Each web platform article comes with code samples, live demo, browser support matrix, and more",
-      "platform": "wide"
-    },
     {
       "src": "/Images/assets/screenShots/07-home-mobile.png",
       "sizes": "1079x1919",