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.

Sikander Saleem 9f8bcc63f3 Merge branch 'new_design_sikander' into development_new_design_2.0 ... # Conflicts: # lib/pages/medical/prescriptions/prescriptions_history_details_page.dart		4 years ago
..
analytics	merge changes-4	4 years ago
config	merge conflicts resolved	4 years ago
core	UI updates & fixes	4 years ago
extensions	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
generated/json	Imports organized	4 years ago
models	updates & fixes	4 years ago
pages	Merge branch 'new_design_sikander' into development_new_design_2.0	4 years ago
services	Family file fixes	4 years ago
theme	Imports organized	4 years ago
uitl	Merge branch 'development_new_design_2.0' into haroon-new-design	4 years ago
widgets	Merge branch 'new_design_sikander' into development_new_design_2.0	4 years ago
Constants.dart	code merged	5 years ago
d_q_icons_icons.dart	voice command updated	5 years ago
locator.dart	Imports organized	4 years ago
main.dart	Imports organized	4 years ago
routes.dart	Imports organized	4 years ago
splashPage.dart	Merge branch 'new_design_sikander' into development_new_design_2.0	4 years ago