6 commits

Author	SHA1	Message	Date
Merge	30023422b8	Desktop cherry-pick: "7240 Integrate lbry redux and lbryinc"	2021-10-19 20:40:07 +08:00
jessop	2403187917	clearer preference merge code?	2020-09-21 14:11:25 -04:00
jessop	df13f97588	sync error messaging	2020-09-21 14:11:25 -04:00
jessop	99955ba59c	password fix 2	2020-09-21 14:11:25 -04:00
jessop	5f54469971	fix race condition	2020-09-21 14:11:25 -04:00
jessop	3b23f09bed	fix sync clean wallet bug ... remove previous changes,keep syncpref in wallet, change anon wallet pref key to local sync choices wip dont relocate syncenable setting bump no prefs on web unauth bugfix redux bump pull after sync change bump	2020-09-21 14:11:25 -04:00