Fix merge conflicts

2026-10-16 02:16:34 +00:00 · 2024-06-25 14:46:58 -07:00
parent 24c75c6325 285a01af51
commit b01b4323ca
171 changed files with 4384 additions and 535 deletions
@@ -23,6 +23,7 @@ export type SubscriptionPlan = {
  workspacesUsed: number;
  environmentLimit: number;
  samlSSO: boolean;
+  oidcSSO: boolean;
  scim: boolean;
  ldap: boolean;
  groups: boolean;