Merge remote-tracking branch 'upstream/main' into main-upstream

VinyarionHyarmendacil · Aug 7, 2023 · 23d18bd · 23d18bd
2 parents cc551f7 + d1181fa
commit 23d18bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/openapi/components/schemas/CurrentUserPresence.yaml b/openapi/components/schemas/CurrentUserPresence.yaml
@@ -17,7 +17,8 @@ properties:
     type: string
     nullable: true
   instanceType:
-    $ref: ./InstanceType.yaml
+    type: string
+    description: either an InstanceType or an empty string
     nullable: true
   isRejoining:
     type: string

diff --git a/package-lock.json b/package-lock.json