dev_sultan #257

Merged
khansultan1 merged 3 commits from dev_sultan into master 17 hours ago

3 Commits (main)

Author SHA1 Message Date
Sultan khan fee2001499 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
17 hours ago
Sultan khan 929a25d9a4 no message 17 hours ago
Sultan khan a81044c7eb Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 18 hours ago