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 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
..
config Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
core Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
models Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
pages Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
services Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
uitl Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
widgets Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
locator.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance 4 years ago
main.dart Master Merged in to local 4 years ago
routes.dart family files. 4 years ago