Merge branch 'main' into 7766-main-merge

2023-10-11 12:56:52 -07:00
parent 11e2b0b533 8c01efd832
commit 70e0182e4d
136 changed files with 7157 additions and 1403 deletions
@@ -70,6 +70,7 @@
        "idp_name": ""
      }
    },
+    "scripts": null,
    "sso_settings": {
      "enable_jit_provisioning": false,
      "enable_jit_role_sync": false,