Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-07-23 22:55:18 +07:00
40 changed files with 795 additions and 52 deletions

View File

@@ -118,8 +118,9 @@
"documentation/platform/pit-recovery",
"documentation/platform/secret-versioning",
"documentation/platform/audit-logs",
"documentation/platform/token",
"documentation/platform/mfa",
"documentation/platform/token"
"documentation/platform/saml"
]
},
{
@@ -225,6 +226,7 @@
"integrations/cloud/checkly",
"integrations/cloud/hashicorp-vault",
"integrations/cloud/azure-key-vault",
"integrations/cloud/cloud-66",
"integrations/cicd/githubactions",
"integrations/cicd/gitlab",
"integrations/cicd/circleci",