Commit Graph

4 Commits (169aafa26b8e526f5dee1edb1c3a22b7cc6f1ad7)

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 e61c26b853 Auto SMS, Themes, Voice Command 5 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 5 years ago
Sultan Khan 283473a06a theme changes 5 years ago