Commit Graph

1 Commits (13a4c9e0f81663caf9dccb0a61cd032540b881e4)

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
7 months ago