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.
diplomatic-quarter/lib
haroon amjad 42dbe066fd Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
#	lib/services/payfort_services/payfort_service.dart
#	lib/services/payfort_services/payfort_view_model.dart
#	lib/uitl/translations_delegate_base.dart
2 years ago
..
analytics
app_state
config Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn 2 years ago
core Patient app update 2 years ago
extensions
generated/json
models Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn 2 years ago
pages Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn 2 years ago
services Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn 2 years ago
theme Sickleave updates 2 years ago
uitl Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn 2 years ago
widgets Update to stores 16.5: 2 years ago
Constants.dart
d_q_icons_icons.dart
firebase_options.dart
locator.dart
main.dart
routes.dart
splashPage.dart