You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_Patient_App_New/lib/presentation/home/widgets
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
7 days ago
..
habib_wallet_card.dart Merge branch 'refs/heads/master' into dev_sikander 7 days ago
large_service_card.dart Merge branch 'refs/heads/master' into dev_sikander 7 days ago
small_service_card.dart Merge branch 'refs/heads/master' into dev_sikander 7 days ago
welcome_widget.dart Translation updates 2 weeks ago