Commit Graph

12 Commits (2fda47baf6ea2a63baaa2d2c387e9c9a76c7afed)

Author SHA1 Message Date
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
Sultan Khan 9bfd725e4f bug fixes 5 years ago
Mohammad Aljammal ad88f6de04 fix theme issues 5 years ago
Sultan Khan b891c1bd80 theme issue 5 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Sultan Khan 8d499704dc family file changes 5 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 5 years ago
Sultan Khan 58b1f648c1 setting theme 5 years ago
Sultan Khan 283473a06a theme changes 5 years ago