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
..
kassaView	fix deprecate methods	2021-01-18 12:47:59 +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