Commit Graph

6 Commits (9dfd8a71dc3dd6ccfbe517069cce86f592c02888)

Author SHA1 Message Date
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
5 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 5 years ago
Mohammad Aljammal dc898a799d Add Privileges 5 years ago
Mohammad Aljmma 7b55454fde fix issue#5 5 years ago
Sultan Khan 3ad928902b voice command 5 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 5 years ago