mirror of
https://github.com/netbirdio/android-client.git
synced 2026-09-23 09:30:52 -07:00
# Conflicts: # app/src/main/java/io/netbird/client/MainActivity.java # app/src/main/java/io/netbird/client/ServiceAccessor.java # app/src/main/java/io/netbird/client/ui/ssh/SshSessionsFragment.java # app/src/main/res/navigation/mobile_navigation.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-pt/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/dimens.xml # app/src/main/res/values/strings.xml # netbird # tool/src/main/java/io/netbird/client/tool/EngineRunner.java # tool/src/main/java/io/netbird/client/tool/VPNService.java # tool/src/main/res/values/strings.xml