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.

haroon amjad 00d9214460 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... # Conflicts: # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/others/app_scaffold_widget.dart		4 years ago
..
config	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
core	login changes	4 years ago
models	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
pages	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
services	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
uitl	Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	4 years ago
widgets	Merge branch 'sultan' 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 sultan	4 years ago
main.dart	Master Merged in to local	4 years ago
routes.dart	login changes	4 years ago