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
..
components	Merge branch 'master' into backend_nfc	2021-03-03 17:39:13 +06:00
tabs	Merge branch 'master' into backend_nfc	2021-03-03 17:39:13 +06:00
home_view.dart	fix deprecate methods	2021-01-18 12:47:59 +06:00