Commit Graph

7 Commits (eeb073fb17e167ab909a477e376a27da8e2e4888)

Author SHA1 Message Date
Sultan Khan c65983bfdb code merged 4 years ago
Mohammad Aljammal 9dfd8a71dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 4 years ago
Mohammad Aljammal dc898a799d Add Privileges 4 years ago
Mohammad Aljmma 7b55454fde fix issue#5 4 years ago
Sultan Khan 3ad928902b voice command 4 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 4 years ago