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.

Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 ... # Conflicts: # ios/Runner.xcodeproj/project.pbxproj # lib/config/config.dart # lib/core/viewModels/project_view_model.dart # lib/main.dart # lib/pages/BookAppointment/BookConfirm.dart # lib/pages/landing/landing_page.dart # lib/pages/livecare/widgets/LiveCareHistoryCard.dart # lib/pages/medical/eye/ContactLensPage.dart # lib/pages/medical/medical_profile_page_new.dart # lib/uitl/LocalNotification.dart # lib/uitl/gif_loader_dialog_utils.dart # lib/widgets/Loader/gif_loader_container.dart # lib/widgets/data_display/medical/time_line_new_widget.dart # lib/widgets/drawer/app_drawer_widget.dart # pubspec.yaml		8 months ago
..
gif_loader_container.dart	Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6	8 months ago