Commit Graph

4 Commits (b2e9060c3fe8a3dca2ed4e4f1b26d31da53082be)

Author SHA1 Message Date
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
5 years ago
mosazaid b70c7d7d05 fix pharmacy auth 5 years ago
enadhilal 292e983614 fixing issues 5 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 5 years ago