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
Aamir.Muhammad d9cf383648 Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/reports/report_home_page.dart
2 years ago
..
analytics
…
app_state
…
config Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6 2 years ago
core Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6 2 years ago
extensions
…
generated/json
…
models Null fixes after merge from 3.13 3 years ago
pages Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6 2 years ago
services Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6 3 years ago
theme
…
uitl Null fixes after merge from 3.13 3 years ago
widgets Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6 2 years ago
Constants.dart
…
d_q_icons_icons.dart
…
firebase_options.dart
…
locator.dart
…
main.dart updates 3 years ago
routes.dart Zoom Video SDK integrated 3 years ago
splashPage.dart updates 3 years ago