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
..
core	Merge branch 'master' into backend_nfc	2021-01-18 12:16:36 +06:00
redux	Merge branch 'master' into backend_nfc	2021-01-18 12:16:36 +06:00
shared	http://redmine.helios-soft.kz/issues/1791 HalyPos разместить логотип банка при оплате POS	2021-01-12 11:56:53 +06:00
test	#1790 - Камера EAN-Datamatrix для JS1	2021-01-15 11:11:44 +06:00
views	Merge branch 'master' into backend_nfc	2021-01-18 12:16:36 +06:00
widgets	#1790 - Камера EAN-Datamatrix для JS1	2021-01-15 11:11:44 +06:00
main.dart	fix bugs after up dependencies version	2021-01-05 17:12:24 +06:00