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
..
amnezia/vpn	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
ftylitak/qzxing	Moving to Qt6:	2022-12-23 17:32:20 +03:00