mirror of
https://github.com/bitwarden/browser
synced 2026-02-07 12:13:45 +00:00
# Conflicts: # apps/browser/src/_locales/en/messages.json # apps/browser/src/popup/app-routing.module.ts # apps/cli/src/auth/commands/login.command.ts # apps/cli/src/locales/en/messages.json # apps/cli/src/program.ts # apps/desktop/src/app/app-routing.module.ts # apps/desktop/src/locales/en/messages.json # apps/web/src/app/oss-routing.module.ts # apps/web/src/app/shared/loose-components.module.ts # apps/web/src/locales/en/messages.json # libs/angular/src/auth/components/sso.component.spec.ts # libs/angular/src/auth/components/sso.component.ts # libs/auth/src/angular/sso/sso.component.ts # libs/common/src/auth/models/domain/auth-result.ts # libs/common/src/key-management/key-connector/abstractions/key-connector.service.ts # libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts # libs/common/src/key-management/key-connector/services/key-connector.service.ts # libs/key-management-ui/src/index.ts # libs/key-management-ui/src/key-connector/remove-password.component.spec.ts # libs/key-management-ui/src/key-connector/remove-password.component.ts