Просмотр исходного кода

Merge upstream/main into webapi branch

Resolved conflicts:
- .gitignore: Kept wapi-docs/ entry from WebAPI branch
- api.yml: Preserved WebAPI key management endpoints while keeping BART updates
- foodgroup/buddy.go: Kept existing BroadcastBuddyArrived method (both branches had it)
- server/http/mgmt_api.go: Kept WebAPI version with webAPIKeyManager parameter
- state/session_manager_test.go: Kept additional NotNil assertion from WebAPI branch
ukozi 9 месяцев назад
Родитель
Сommit
7ea2642837
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      api.yml

+ 2 - 1
api.yml

@@ -1146,6 +1146,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/MessageResponse'
 
+
 components:
   schemas:
     MessageResponse:
@@ -1221,4 +1222,4 @@ components:
           items:
             type: string
           description: List of enabled features/endpoints. Empty list allows all capabilities.
-          example: ["aim.session", "presence.get"]
+          example: ["aim.session", "presence.get"]