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
..
app	Merge branch 'master' into backend_nfc	2021-03-03 17:39:13 +06:00
gradle/wrapper	redux-navigation example	2020-05-20 11:30:18 +06:00
.gitignore	redux-navigation example	2020-05-20 11:30:18 +06:00
build.gradle	ui commit and debug fix	2020-08-02 17:07:49 +06:00
gradle.properties	redux-navigation example	2020-05-20 11:30:18 +06:00
key.properties	android sign build	2020-07-08 14:27:07 +06:00
settings.gradle	redux-navigation example	2020-05-20 11:30:18 +06:00
settings_aar.gradle	android splashscreen	2020-07-02 17:15:26 +06:00