suvaissov f8d7e4717f Merge branch 'master' into backend_nfc ... # Conflicts: # lib/core/services/DataService.dart # lib/views/start_up/start_up_view.dart # pubspec.lock # pubspec.yaml		2021-01-18 12:16:36 +06:00
..
components	- halykpos logo	2021-01-14 22:10:53 +06:00
tabs	Merge branch 'master' into backend_nfc	2021-01-18 12:16:36 +06:00
home_view.dart	ui and back worked	2020-08-23 14:05:56 +06:00