Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts: lib/pages/BookAppointment/components/DocAvailableAppointments.dart lib/pages/Covid-DriveThru/Covid-TimeSlots.dartmerge-update-with-lab-changes
commit
124d388ee1
Loading…
Reference in New Issue