Commit Graph

1 Commits (b78c78ed8b51c357006f97628c6ed3d6e9a9d33b)

Author SHA1 Message Date
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
2 months ago