commit 3b796cf63b1293216096aa24af8aa7b28af63655 Merge: 3bcb7625 76a52f7f Author: n8fr8 nathan@guardianproject.info Date: Mon Aug 3 15:04:41 2020 -0400
Merge branch 'bridge_wiz_rotation_fix' of https://github.com/bitmold/orbot into bitmold-bridge_wiz_rotation_fix
app/src/main/AndroidManifest.xml | 7 +- .../ui/onboarding/BridgeWizardActivity.java | 118 +++++++++++++++------ .../main/res/layout/activity_custom_bridges.xml | 2 +- app/src/main/res/layout/content_bridge_wizard.xml | 8 ++ app/src/main/res/values/strings.xml | 6 +- 5 files changed, 104 insertions(+), 37 deletions(-)