Skip to content

Commit ff91dfb

Browse files
TimShererWithAquentTimShererWithAquent
committed
Resolve merge issues.
2 parents 3913325 + 302a85e commit ff91dfb

File tree

2,213 files changed

+32787
-29518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,213 files changed

+32787
-29518
lines changed

‎.github/workflows/stale.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,6 @@
128128
"branch": "master",
129129
"branch_mapping": {}
130130
},
131-
{
132-
"path_to_root": "azure-docs-snippets-pr",
133-
"url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
134-
"branch": "main",
135-
"branch_mapping": {}
136-
},
137131
{
138132
"path_to_root": "azure-functions-dapr-extension",
139133
"url": "https://github.com/Azure/azure-functions-dapr-extension",

‎.openpublishing.redirection.json

Lines changed: 5223 additions & 4794 deletions
Large diffs are not rendered by default.

‎articles/active-directory-b2c/enable-authentication-angular-spa-app-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ if (this.msalGuardConfig.authRequest) {
411411
authRequestConfig = { ...this.msalGuardConfig.authRequest } as RedirectRequest
412412
}
413413

414-
authRequestConfig.extraQueryParameters = {"id_token_hint": idToken};;
414+
authRequestConfig.extraQueryParameters = {"id_token_hint": idToken};
415415

416416
this.authService.loginRedirect(authRequestConfig);
417417

‎articles/active-directory-b2c/media/add-api-connector-token-enrichment/example-anonymized-audit-log.png

-44.7 KB
Loading

‎articles/active-directory-b2c/media/add-api-connector/example-anonymized-audit-log.png

-44.9 KB
Loading

‎articles/active-directory-b2c/media/client-credentials-grant-flow/copy-application-secret.png

16.3 KB
Loading

‎articles/active-directory-b2c/media/custom-policies-series-store-user/screenshot-of-create-users-custom-policy.png

-2.37 KB
Loading

‎articles/active-directory-b2c/media/partner-akamai-secure-hybrid-access/akamai-oidc-app-settings.png

9.67 KB
Loading

‎articles/active-directory-b2c/media/partner-arkose-labs/search-app-id.png

33.1 KB
Loading

0 commit comments

Comments
 (0)