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
mosazaid 38d52b52c8 Merge branch 'development' into fix_design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
4 years ago
..
config Merge branch 'development' into fix_design 4 years ago
core Merge branch 'development' into fix_design 4 years ago
generated/json Geofencing in progress 4 years ago
models fix merge issues 4 years ago
pages Merge branch 'development' into fix_design 4 years ago
services Merge branch 'development' into pharmacy-Fatima 4 years ago
theme Ereferral fixes, smartwatch health data integration 4 years ago
uitl Merge branch 'development' into fix_design 4 years ago
widgets Merge branch 'development' into ZohaibIqbalKambrani 4 years ago
Constants.dart change color 4 years ago
d_q_icons_icons.dart no message 4 years ago
locator.dart Merge branch 'development' into fix_design 4 years ago
main.dart hot fixing 4 years ago
routes.dart fix merge issues 4 years ago
splashPage.dart return privilege 4 years ago