2 commits

Author	SHA1	Message	Date
infinite-persistence	2a7f89d6b5	Post-merge updates and fixes ... - Put back SETTINGS.LANGUAGE. - Update import for `doResolveUris`.	2021-10-19 20:40:07 +08:00
Merge	30023422b8	Desktop cherry-pick: "7240 Integrate lbry redux and lbryinc"	2021-10-19 20:40:07 +08:00