[tor-commits] [manual/master] Merge remote-tracking branch 'PROTechThor/tba' into develop

[gus@xxxxxxxxxxxxxx]

commit 596f1e77aaa9a08e3e62253dfac911edfe060348
Merge: 2eaefb4 9de6026
Author: emma peel <emma.peel@xxxxxxxxxx>
Date:   Wed Jan 15 14:14:33 2020 +0100

    Merge remote-tracking branch 'PROTechThor/tba' into develop

 assets/static/images/android-censored.png          | Bin 0 -> 74940 bytes
 assets/static/images/android-configure.png         | Bin 0 -> 69892 bytes
 assets/static/images/android-connect.png           | Bin 0 -> 69965 bytes
 assets/static/images/android-new-identity.png      | Bin 0 -> 105151 bytes
 assets/static/images/android-provide-a-bridge.png  | Bin 0 -> 109572 bytes
 assets/static/images/android-provided-a-bridge.png | Bin 0 -> 98794 bytes
 assets/static/images/android-security-settings.gif | Bin 0 -> 1345090 bytes
 assets/static/images/android-select-a-bridge.png   | Bin 0 -> 109560 bytes
 assets/static/images/android-selected-a-bridge.png | Bin 0 -> 124065 bytes
 .../images/android-uninstall-device-settings.png   | Bin 0 -> 56778 bytes
 assets/static/images/android-uninstall-f-droid.png | Bin 0 -> 75448 bytes
 .../images/android-uninstall-google-play.png       | Bin 0 -> 63565 bytes
 assets/static/images/android-update-f-droid.png    | Bin 0 -> 75419 bytes
 .../static/images/android-update-google-play.png   | Bin 0 -> 63592 bytes
 content/menu/contents.lr                           |   1 +
 content/mobile-tor/contents.lr                     | 222 +++++++++++++++++++++
 databags/topics+en.ini                             |   6 +-
 17 files changed, 226 insertions(+), 3 deletions(-)

diff --cc databags/topics+en.ini
index 35508a9,1626bed..e960880
--- a/databags/topics+en.ini
+++ b/databags/topics+en.ini
@@@ -54,14 -66,10 +54,14 @@@ label = Uninstallin
  path = make-tor-portable
  label = Making Tor Browser portable
  
 +[troubleshooting]
 +path = troubleshooting
 +label = Troubleshooting
 +
 +[known-issues]
 +path = known-issues
 +label = Known issues
 +
- [becoming-tor-translator]
- path = becoming-tor-translator
- label = Becoming a Tor Translator
+ [mobile-tor]
+ path = mobile-tor
+ label = Mobile Tor
 -
 -[becoming-tor-translator]
 -path = becoming-tor-translator
 -label = Becoming a Tor Translator



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits