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.
diplomatic-quarter/lib
haroon amjad cf6686e413 Merge branch 'master' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
..
config Merge branch 'master' into Haroon 5 years ago
core Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter 5 years ago
models Merge branch 'master' into Haroon 5 years ago
pages Merge branch 'master' into Haroon 5 years ago
services Revert "Merge branch 'pharmacy-hussam' into 'master'" 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl Merge branch 'master' into Haroon 5 years ago
widgets Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter 5 years ago
d_q_icons_icons.dart working on pharmacy home page 5 years ago
locator.dart Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter 5 years ago
main.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
routes.dart fix merge issues 5 years ago
splashPage.dart fix issues 5 years ago