Merge remote-tracking branch 'origin/main'

2025-09-22 11:26:43 +02:00
parent bf9ae5f01f 83fad59878
commit f27a1df90f
789 changed files with 14011 additions and 16477 deletions
@@ -100,6 +100,7 @@
 *           type: string
 *           format: email
 *
+<<<<<<< HEAD
 *     ForgotPasswordRequest:
 *       type: object
 *       required:
@@ -131,6 +132,8 @@
 *         message:
 *           type: string
 *
+=======
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 *     Organization:
 *       type: object
 *       properties:
@@ -460,6 +463,7 @@

 /**
 * @swagger
+<<<<<<< HEAD
 * /api/users/verify-email/{token}:
 *   get:
 *     tags: [Users]
@@ -539,6 +543,8 @@

 /**
 * @swagger
+=======
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 * /api/organizations/search:
 *   get:
 *     tags: [Organizations]