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
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
2 months ago
..
core Merge branch 'master' into faiz_dev1 2 months ago
extensions Merge branch 'master' into faiz_dev1 2 months ago
features Merge branch 'master' into faiz_dev1 2 months ago
generated Merge branch 'master' into dev_aamir 2 months ago
presentation Merge branch 'master' into faiz_dev1 2 months ago
routes completed login function 2 months ago
services completed till otp receiving 2 months ago
theme Merge branch 'master' into dev_aamir 2 months ago
widgets Merge branch 'master' into faiz_dev1 2 months ago
firebase_options.dart initial commit 2 months ago
main.dart Merge branch 'master' into faiz_dev1 2 months ago
splashPage.dart Merge branch 'master' into faiz_dev1 2 months ago