2 Commits (bf88d84022969941e2101a7b920bf1d52b6c723b)

Author	SHA1	Message	Date
haroon amjad	7d0efda1c4	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # android/app/src/main/AndroidManifest.xml # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/pages/landing/landing_page.dart # lib/pages/login/confirm-login.dart # lib/pages/medical/medical_profile_page.dart # lib/services/authentication/auth_provider.dart # lib/uitl/translations_delegate_base.dart # pubspec.yaml	6 years ago
haroon amjad	d8fe501341	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # lib/config/config.dart # lib/pages/BookAppointment/BookingOptions.dart # lib/services/appointment_services/GetDoctorsList.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/others/app_scaffold_widget.dart	6 years ago