Merge branch 'customer-service' into legacy
# Conflicts: # apps/mobile_app/lib/navigation/app_router.dart # modules/legacy/melos_legacy.iml # packages/navigation/lib/app_routes.dart # packages/sf_localizations/assets/l10n/en.json # packages/sf_localizations/assets/l10n/es.json # packages/sf_localizations/lib/src/generated/i18n.dart
This commit is contained in:
@@ -41,8 +41,6 @@ dependencies:
|
||||
path: ../../modules/auth
|
||||
home:
|
||||
path: ../../modules/home
|
||||
hub:
|
||||
path: ../../modules/legacy/modules/hub
|
||||
profile:
|
||||
path: ../../modules/profile
|
||||
notifications:
|
||||
@@ -51,6 +49,10 @@ dependencies:
|
||||
path: ../../modules/dashboard_shell
|
||||
legacy_dashboard_shell:
|
||||
path: ../../modules/legacy/modules/legacy_dashboard_shell
|
||||
hub:
|
||||
path: ../../modules/legacy/modules/hub
|
||||
customer_service:
|
||||
path: ../../modules/legacy/modules/customer_service
|
||||
splash:
|
||||
path: ../../modules/splash
|
||||
account:
|
||||
|
||||
Reference in New Issue
Block a user