You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_Patient_App/lib
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
..
config Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago
core Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago
models implementing Twilio in LiveCare 5 years ago
pages Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago
services implementing livecare 5 years ago
uitl Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago
widgets Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago
d_q_icons_icons.dart add ions 5 years ago
locator.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago
main.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago
routes.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard 5 years ago