Compare commits

..
Author SHA1 Message Date
Akinwale Ariwodola 79a8862573 fix merge conflict 2020-03-13 17:04:52 +01:00
Akinwale Ariwodola 1a638e88e4 update setting text 2020-03-13 17:02:53 +01:00
Akinwale Ariwodola 9bad912cc9 Merge remote-tracking branch 'origin/master' into dht 2020-03-06 12:44:23 +01:00
Akinwale Ariwodola 21749453df dht setting 2020-02-10 11:58:51 +01:00
2 changed files with 3 additions and 3 deletions

No files matched your search

+1 -1
View File
@@ -15,7 +15,7 @@
"base-64": "^0.1.0",
"@expo/vector-icons": "^8.1.0",
"gfycat-style-urls": "^1.0.3",
"lbry-redux": "lbryio/lbry-redux#84e697079968364fe526020086c8a44f4d2ef391",
"lbry-redux": "lbryio/lbry-redux#f6e99498d2bc5b3f07e1e2b6f668a1a48de35047",
"lbryinc": "lbryio/lbryinc#1fc104c2d29d1d3975234c3606e848eaa28e1b6e",
"lodash": ">=4.17.11",
"merge": ">=1.2.1",
+2 -2
View File
@@ -4591,9 +4591,9 @@ latest-version@^3.0.0:
dependencies:
package-json "^4.0.0"
lbry-redux@lbryio/lbry-redux#84e697079968364fe526020086c8a44f4d2ef391:
lbry-redux@lbryio/lbry-redux#f6e99498d2bc5b3f07e1e2b6f668a1a48de35047:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/84e697079968364fe526020086c8a44f4d2ef391"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/f6e99498d2bc5b3f07e1e2b6f668a1a48de35047"
dependencies:
proxy-polyfill "0.1.6"
reselect "^3.0.0"