Commit Graph

1 Commits (6a4650d65864687fe7acb2b6cf530e50bce9d410)

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