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
..
bank_setting	- halykpos logo	2021-01-14 22:10:53 +06:00
bank_view	close day success	2021-01-02 16:51:08 +06:00
check	refund release	2021-01-05 16:09:12 +06:00
close_day_view	- halykpos logo	2021-01-14 22:10:53 +06:00
history	- halykpos logo	2021-01-14 22:10:53 +06:00
home	Merge branch 'master' into backend_nfc	2021-03-03 17:39:13 +06:00
info_kkm	linter small fixes	2020-07-08 12:42:12 +06:00
login	ui busy button fix	2020-07-14 16:35:13 +06:00
payment	- halykpos logo	2021-01-14 22:10:53 +06:00
payment_nfc	- halykpos logo	2021-01-14 22:10:53 +06:00
qr_view	linter small fixes	2020-07-08 12:42:12 +06:00
start_up	fix bugs after up dependencies version	2021-01-05 17:12:24 +06:00