2 Commits (f6fd7587f25db580fda9c459c0b64ba39e16b858)

Author	SHA1	Message	Date
Fatimah Alshammari	0f22a50a5d	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/profile/profile.dart	6 years ago
Fatimah Alshammari	52fa0f6f89	fixed orders	6 years ago