Commit Graph

7 Commits (66a9afa6f304bcc5b2ca45b72fe44accd89b7d75)

Author SHA1 Message Date
Faiz Hashmi c10fb7f1a9 Merge branch 'dev_3.3_BLE' into dev_v3.13.6_BLE_Faiz
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	assets/images/new-design/passport.svg
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	pubspec.yaml
2 years ago
haroon amjad 6c9ab32d98 Native changes 2 years ago
haroon amjad 23ab0483e0 BLE implementation started 2 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
haroon amjad 887303fcde updates 4 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 4 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 5 years ago