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.
PatientApp-KKUMC/lib
Mohammad Aljammal d093ecd5e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	ios/Podfile
	ios/Runner.xcodeproj/project.pbxproj
	lib/config/config.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
..
config Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign 6 years ago
core fix merge issues 6 years ago
models Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 6 years ago
pages Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign 6 years ago
services Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 6 years ago
uitl Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign 6 years ago
widgets Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign 6 years ago
d_q_icons_icons.dart add ions 6 years ago
locator.dart done vital sign 6 years ago
main.dart Master Merged in to local 6 years ago
routes.dart family files. 6 years ago