Commit Graph

2 Commits (b343d433e9eb27e3df9ba6d72433639d25955f67)

Author SHA1 Message Date
error500 0345a310e5 Merge branch 'backend_nfc' into ns_bank_merge
# Conflicts:
#	lib/core/logger.dart
#	lib/core/models/check_data.dart
#	lib/core/router.dart
#	lib/core/services/DataService.dart
#	lib/main.dart
#	lib/redux/store.dart
#	lib/views/check/image_show_container.dart
#	lib/views/history/history_view.dart
#	lib/views/home/home_view_m.dart
#	lib/views/home/tabs/AdditionalTab.dart
#	lib/views/login/login_view.dart
#	lib/views/payment/payment_view.dart
#	lib/views/start_up/start_up_view.dart
#	pubspec.lock
#	pubspec.yaml
2022-01-25 17:04:36 +06:00
Serik.Uvaissov 23774d69dc animation with content 2020-07-30 16:47:42 +06:00