Dmitriy Karpushin 39736e865e Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter ... # Conflicts: # client/platforms/android/android_controller.cpp # client/platforms/android/android_controller.h		2023-01-19 14:09:12 +03:00
..
android	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
ios	Merge branch 'qt_migration' into qmake-to-cmake-migration	2022-12-13 15:34:38 +01:00
linux	cleaned up	2022-05-11 22:54:55 +00:00
macos	iOS Wireguard	2021-10-23 04:26:47 -07:00
windows	Remove travis builds and tiny refactoring	2022-12-04 21:54:22 +01:00