[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [orbot/master] Merge branch 'master' of https://github.com/guardianproject/orbot
commit b1049ca625f8a2bbba58aede4dfa72014973a390
Merge: 410ae032 b9804c12
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date: Fri Apr 24 17:01:53 2020 -0400
Merge branch 'master' of https://github.com/guardianproject/orbot
README | 2 +-
.../org/torproject/android/OrbotMainActivity.java | 3 -
.../org/torproject/android/settings/Languages.java | 18 +---
.../torproject/android/settings/LocaleHelper.java | 6 --
.../android/ui/onboarding/CustomSlideBigText.java | 60 ++++++++----
.../android/ui/onboarding/OnboardingActivity.java | 105 ++++++++++++++-------
app/src/main/res/values/strings.xml | 7 ++
7 files changed, 126 insertions(+), 75 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits