Commit Graph

2 Commits (f1f28f5ed0d34a31632f8a38776f9940d5ebf45c)

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