Merge branch 'ykris45-patch-5'

This commit is contained in:
Niko Storni 2018-10-11 16:51:14 -04:00
commit fc7c431bbe
No known key found for this signature in database
GPG key ID: F37FE63398800368
2 changed files with 59 additions and 13 deletions

View file

@ -745,25 +745,25 @@
}
}
},
"!alpha": {
"!android": {
"usage": "",
"description": "Android Alpha Tester",
"description": "LBRY Android Beta",
"operation": "send",
"bundle": {
"url": "",
"title": "",
"description": "Sign up to become an alpha tester for our [Android app](https://lbry.io/android-alpha)!",
"description": "Download our LBRY Android app [here](https://play.google.com/apps/testing/io.lbry.browser)!",
"color": 7976557,
"author": {
"name": "Android Alpha Tester",
"url": "https://lbry.io/android-alpha",
"name": "LBRY Android Beta",
"url": "https://play.google.com/apps/testing/io.lbry.browser",
"icon_url": "https://i.imgur.com/yWf5USu.png"
}
}
},
"!fund": {
"usage": "",
"description": "Android Alpha Tester",
"description": "LBRY Fund Project",
"operation": "send",
"bundle": {
"url": "",
@ -827,5 +827,37 @@
"icon_url": "https://i.imgur.com/yWf5USu.png"
}
}
},
"!ios": {
"usage": "",
"description": "iOS waiting list",
"operation": "send",
"bundle": {
"url": "",
"title": "",
"description": "LBRY is not yet out on this [platform](https://lbry.io/iOS), but will be soon. Enter your email to be notified when it is released!",
"color": 7976557,
"author": {
"name": "iOS waiting list",
"url": "https://lbry.io/ios",
"icon_url": "https://i.imgur.com/yWf5USu.png"
}
}
},
"!3d": {
"usage": "",
"description": "3D Printing Program",
"operation": "send",
"bundle": {
"url": "",
"title": "",
"description": "Want to earn rewards for 3D printing nifty items? Explore our [3D Printing Program](https://lbry.io/3d-printing) ",
"color": 7976557,
"author": {
"name": "3D Printing Program",
"url": "https://lbry.io/3d-printing",
"icon_url": "https://i.imgur.com/yWf5USu.png"
}
}
}
}

28
package-lock.json generated
View file

@ -1006,11 +1006,13 @@
},
"balanced-match": {
"version": "1.0.0",
"bundled": true
"bundled": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -1023,15 +1025,18 @@
},
"code-point-at": {
"version": "1.1.0",
"bundled": true
"bundled": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true
"bundled": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true
"bundled": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@ -1134,7 +1139,8 @@
},
"inherits": {
"version": "2.0.3",
"bundled": true
"bundled": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@ -1144,6 +1150,7 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -1156,17 +1163,20 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true
"bundled": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -1183,6 +1193,7 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -1255,7 +1266,8 @@
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true
"bundled": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@ -1265,6 +1277,7 @@
"once": {
"version": "1.4.0",
"bundled": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -1370,6 +1383,7 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",