Commit Graph

1 Commits (c19451a6b6da1c270ae2affb7d41b6cae347d9a1)

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