Commit Graph

1 Commits (e8c71e96d9f4d557298b3673f8c4754ce2f82b3a)

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