Merge branch 'npm-5' of https://github.com/6ea86b96/lbry-app into 6ea86b96-npm-5

2017-06-06 17:41:25 -04:00 · 2017-06-06 17:41:25 -04:00 · 6f0e429ac4
commit 6f0e429ac4
parent e0bcf44202 955e9564e0
4 changed files with 7534 additions and 5 deletions
--- a/app/package-lock.json
+++ b/app/package-lock.json
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -32,11 +32,15 @@
      },
      "backgroundColor": "155B4A"
    },
-    "protocols": [{
-      "name": "lbry",
-      "role": "Viewer",
-      "schemes": ["lbry"]
-    }],
+    "protocols": [
+      {
+        "name": "lbry",
+        "role": "Viewer",
+        "schemes": [
+          "lbry"
+        ]
+      }
+    ],
    "linux": {
      "target": "deb",
      "desktop": {
--- a/ui/package-lock.json
+++ b/ui/package-lock.json