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.
doctor_app_flutter/lib/widgets
Mohammad ALjammal 79eb6b19d0 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
..
auth Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 6 years ago
dashboard Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
doctor merge ibrahim 6 years ago
home dashboard icon updated 6 years ago
medicine Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 6 years ago
patients Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 6 years ago
shared Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 6 years ago