Commit Graph

1 Commits (9f06ce7d1db9b9bc8d25874abd23677a3c8d0a85)

Author SHA1 Message Date
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