albexk 5e80223e7a Merge branch 'dev' into android-7 ... # Conflicts: # .github/workflows/deploy.yml # CMakeLists.txt # client/android/src/org/amnezia/vpn/AmneziaActivity.kt # client/android/src/org/amnezia/vpn/AmneziaVpnService.kt # client/android/src/org/amnezia/vpn/ServiceNotification.kt # client/android/utils/src/main/kotlin/Log.kt # client/android/utils/src/main/kotlin/net/NetworkState.kt		2024-10-22 12:51:10 +03:00
..
src/main/kotlin	Merge branch 'dev' into android-7	2024-10-22 12:51:10 +03:00
build.gradle.kts	ProtocolApi refactoring, move network classes to NetworkUtils.kt	2023-11-28 19:47:22 +03:00