Commit Graph

1 Commits (2cc331c1c8f7aeb5896793d6c5935acf0b2510f0)

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