Merge conflict in changelog fixed

CHANGELOG.md

@@ -60,6 +60,7 @@ and this project adheres to
 * [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
 * [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
 * [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
 
 ### test release 2021-01-31
 

src/Bundle/ChillMainBundle/chill.api.specs.yaml

@@ -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"