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
Fatimah Alshammari ddf032bb47 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
..
config Merge branch 'pharmacy' into pharmacy-Fatima 4 years ago
core fix merge issue 4 years ago
models Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
pages Merge branch 'pharmacy' into pharmacy-Fatima 4 years ago
services Merge branch 'pharmacy' into pharmacy-Fatima 4 years ago
uitl Merge branch 'pharmacy' into pharmacy-Fatima 4 years ago
widgets Merge branch 'pharmacy' into pharmacy-Fatima 4 years ago
d_q_icons_icons.dart working on pharmacy home page 4 years ago
locator.dart finish home page and start working on order preview page 4 years ago
main.dart add font 4 years ago
routes.dart symptom checker gender page updated 4 years ago