Commit Graph

7 Commits (f55fbd1cc2cbe44c331ba5e36eaf85024dd5ffbf)

Author SHA1 Message Date
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
5 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 5 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago