master_merge #24

Merged
Haroon6138 merged 2 commits from master_merge into master 4 hours ago

2 Commits (master)

Author SHA1 Message Date
Sultan khan 3a31b8f430 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Updates
  NFC fix

# Conflicts:
#	lib/api/profile_api_client.dart
5 hours ago
Sultan khan 4ebcf59b9d updates and fixes 5 hours ago