shimon 102c86b2a6 Merge branch 'main' of github.com:appwrite/appwrite into 1.5.x-response-request-models ... Conflicts: Dockerfile app/config/specs/open-api3-latest-client.json app/config/specs/open-api3-latest-console.json app/config/specs/open-api3-latest-server.json app/config/specs/swagger2-latest-client.json app/config/specs/swagger2-latest-console.json app/config/specs/swagger2-latest-server.json app/controllers/api/account.php app/controllers/api/users.php app/controllers/shared/api.php app/worker.php composer.json composer.lock src/Appwrite/Event/Mail.php src/Appwrite/Migration/Migration.php src/Appwrite/Migration/Version/V20.php src/Appwrite/Platform/Services/Tasks.php src/Appwrite/Platform/Services/Workers.php src/Appwrite/Platform/Workers/Builds.php src/Appwrite/Platform/Workers/Deletes.php src/Appwrite/Platform/Workers/Mails.php		2024-01-31 20:21:18 +02:00
..
compose.phtml	Merge branch 'main' of github.com:appwrite/appwrite into 1.5.x-response-request-models	2024-01-31 20:21:18 +02:00
env.phtml	Added new templates	2020-07-29 09:56:39 +03:00