Merge branch 'main' into add-new-recommended-block-rules-for-vulnerable-drivers-

This commit is contained in:
Diana Hanson
2022-02-17 12:45:24 -07:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
{:allowed-branchname-matches ["master" "main"] {:allowed-branchname-matches ["main"]
:allowed-filename-matches ["windows/"] :allowed-filename-matches ["windows/"]
:targets :targets

View File

@ -405,13 +405,13 @@
{ {
"path_to_root": "_themes.pdf", "path_to_root": "_themes.pdf",
"url": "https://github.com/Microsoft/templates.docs.msft.pdf", "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
"branch": "master", "branch": "main",
"branch_mapping": {} "branch_mapping": {}
}, },
{ {
"path_to_root": "_themes", "path_to_root": "_themes",
"url": "https://github.com/Microsoft/templates.docs.msft", "url": "https://github.com/Microsoft/templates.docs.msft",
"branch": "master", "branch": "main",
"branch_mapping": {} "branch_mapping": {}
} }
], ],
@ -420,7 +420,7 @@
"Publish", "Publish",
"Pdf" "Pdf"
], ],
"master": [ "main": [
"Publish", "Publish",
"Pdf" "Pdf"
] ]