Commit Graph

1 Commits (31261092a8c5062ac09f904d04aaafe1c1ccb237)

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