Commit Graph

9 Commits (0ce43fde5f987984f9fe087fcb4fa82b5ae254ab)

Author SHA1 Message Date
Sikander Saleem 0ce43fde5f Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart
2 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 2 months ago
Sultan khan 7d5b941df3 merged conflict 2 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
2 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 2 months ago
Sultan khan ac17202b7a search lab order updated. 2 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 2 months ago
haroon amjad 333b813f90 bottom sheet fixes 2 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 2 months ago