Commit Graph

1 Commits (1df5b3abd93b9114d3f37d2f5af4ed743d89d90e)

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