Merge conflict in changelog fixed

This commit is contained in:
2022-02-16 10:56:44 +01:00
2 changed files with 12 additions and 1 deletions

View File

@@ -803,4 +803,14 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/UserJob'
/1.0/main/civility.json:
get:
tags:
- civility
summary: Return all civility types
responses:
200:
description: "ok"
401:
description: "Unauthorized"