2 Commits (25d884c7749c5aa42527f7fd36b9fc4953621b69)

Author	SHA1	Message	Date
mosazaid	25d884c774	Merge branch 'development' into feature-vital-sign ... # Conflicts: # lib/config/localized_values.dart # lib/locator.dart # lib/routes.dart # lib/util/helpers.dart # lib/util/translations_delegate_base.dart # lib/widgets/patients/profile/SOAP/add_SOAP_index.dart # pubspec.lock	6 years ago
mosazaid	b5c937bd86	Working on vitalSigns, ... Merge branch 'development' into feature-vital-sign # Conflicts: # lib/routes.dart	6 years ago