[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [orbot/master] Merge branch 'bitmold-removed_obsolete_version_checks'
commit 16826a4901ba0682a6edd8f8a02efb241fa551de
Merge: 0e4b42a7 17154609
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date: Wed May 29 16:54:25 2019 -0400
Merge branch 'bitmold-removed_obsolete_version_checks'
.gitignore | 7 +++
app/build.gradle | 2 -
.../main/java/org/torproject/android/OrbotApp.java | 14 +-----
.../org/torproject/android/OrbotMainActivity.java | 55 +++++-----------------
.../org/torproject/android/settings/Languages.java | 1 -
.../torproject/android/vpn/VPNEnableActivity.java | 10 +---
fastlane/Appfile | 1 +
fastlane/Fastfile | 27 +++++++++++
metadata/{cs => cs-CZ}/short_description.txt | 0
metadata/{de => de-DE}/full_description.txt | 0
metadata/{de => de-DE}/short_description.txt | 0
metadata/{de => de-DE}/title.txt | 0
metadata/{el => el-GR}/short_description.txt | 0
metadata/{es => es-ES}/full_description.txt | 0
metadata/{fi => fi-FI}/short_description.txt | 0
metadata/{fr => fr-FR}/full_description.txt | 0
metadata/{hi => hi-IN}/short_description.txt | 0
metadata/{hu => hu-HU}/short_description.txt | 0
metadata/{it => it-IT}/short_description.txt | 0
metadata/{ja => ja-JP}/short_description.txt | 0
metadata/{ko => ko-KR}/short_description.txt | 0
metadata/{nl => nl-NL}/short_description.txt | 0
metadata/{no => no-NO}/short_description.txt | 0
metadata/{pl => pl-PL}/short_description.txt | 0
metadata/{ru => ru-RU}/short_description.txt | 0
metadata/{ru => ru-RU}/title.txt | 0
metadata/{sv => sv-SE}/short_description.txt | 0
metadata/{tr => tr-TR}/full_description.txt | 0
.../org/torproject/android/service/TorService.java | 6 ---
.../android/service/util/CustomNativeLoader.java | 12 ++---
.../android/service/util/TorServiceUtils.java | 10 +---
.../android/service/vpn/OrbotVpnManager.java | 1 -
.../android/service/vpn/TorVpnService.java | 14 ++----
.../torproject/android/service/vpn/Tun2Socks.java | 3 --
tools/check-fastlane-whitespace.py | 4 +-
35 files changed, 63 insertions(+), 104 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits