Commit Graph

1 Commits (1de551e7991f5ae449813b0f5b71bcb09a4ebfb0)

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