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.
HMG_Patient_App/lib
enadhilal c22ca4e29e Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
..
config Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
core Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
models Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
pages Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
services Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl mousa and hussam branch 5 years ago
widgets Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
d_q_icons_icons.dart working on pharmacy home page 5 years ago
locator.dart Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
main.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
routes.dart Version Control finished 5 years ago
splashPage.dart fix issues 5 years ago