commit 328ad53c080c02b6038145ae2ee61556829cd5d2 Merge: eeb31422 e7f0feb6 Author: n8fr8 nathan@guardianproject.info Date: Fri Dec 18 11:06:04 2020 -0500
Merge branch 'tladesignz-master'
app-mini/build.gradle | 8 ++-- app/build.gradle | 11 +++-- .../android/ui/onboarding/MoatActivity.java | 49 ++++++++++++++++------ .../android/ui/onboarding/ProxiedHurlStack.java | 32 ++++++++++++++ appcore/build.gradle | 10 ++--- build.gradle | 2 +- intentintegrator/build.gradle | 6 +-- orbotservice/build.gradle | 10 ++--- 8 files changed, 94 insertions(+), 34 deletions(-)