Merge branch 'master' into ZohaibIqbalKambrani

# Conflicts:
#	ios/Flutter/.last_build_id
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/my_balance_service.dart
#	lib/core/service/medical/prescriptions_service.dart
#	lib/core/viewModels/medical/my_balance_view_model.dart
#	lib/core/viewModels/medical/prescriptions_view_model.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/register-info.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/pages/medical/prescriptions/prescription_items_page.dart
#	lib/pages/settings/general_setting.dart
#	lib/pages/settings/profile_setting.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/services/authentication/auth_provider.dart
#	lib/services/permission/permission_service.dart
#	lib/theme/theme_value.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/button.dart
#	lib/widgets/buttons/defaultButton.dart
#	lib/widgets/buttons/floatingActionButton.dart
#	lib/widgets/buttons/mini_button.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/data_display/medical/LabResultWidget.dart
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/data_display/medical/laboratory_result_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
merge-update-with-lab-changes
Zohaib Kambrani 5 years ago
commit 18f5203f56

Diff Content Not Available