suvaissov 54df0728f3 Merge branch 'master' into backend_nfc ... # Conflicts: # android/app/build.gradle # lib/views/home/home_view.dart # pubspec.yaml		2021-03-03 17:39:13 +06:00
..
src	- halykpos logo	2021-01-14 22:10:53 +06:00
build.gradle	Merge branch 'master' into backend_nfc	2021-03-03 17:39:13 +06:00
proguard-rules.pro	try - 1	2020-07-22 01:36:45 +06:00