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
..
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-03-03 17:39:13 +06:00
widgets	fix deprecate methods	2021-01-18 12:47:59 +06:00
main.dart	fix bugs after up dependencies version	2021-01-05 17:12:24 +06:00