Commit Graph

1 Commits (3ddd7781cd14cbfe0c7b0e8a939c415958aabe5f)

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