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
..
bottom_bar.dart	fix deprecate methods	2021-01-18 12:47:59 +06:00
header_title.dart	ui busy button fix	2020-07-14 16:35:13 +06:00
popup_menu.dart	- halykpos logo	2021-01-14 22:10:53 +06:00