Commit Graph

2 Commits (bd5e1ecd5072ed34763c5bb35607b20a489114b9)

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