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
..
kassaView	#1790 - Камера EAN-Datamatrix для JS1	2021-01-15 11:11:44 +06:00
AdditionalTab.dart	- halykpos logo	2021-01-14 22:10:53 +06:00
CalculatorTab.dart	linter small fixes	2020-07-08 12:42:12 +06:00
KassaTab.dart	#1790 - Камера EAN-Datamatrix для JS1	2021-01-15 11:11:44 +06:00