Jake Barnby 942847cf3a Merge remote-tracking branch 'origin/main' into 1.5.x ... # Conflicts: # app/config/collections.php # app/config/errors.php # 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/teams.php # app/controllers/api/users.php # app/controllers/shared/api.php # app/init.php # app/worker.php # composer.json # composer.lock # docker-compose.yml # src/Appwrite/Extend/Exception.php # src/Appwrite/Platform/Services/Tasks.php # src/Appwrite/Platform/Tasks/Maintenance.php # src/Appwrite/Platform/Workers/Certificates.php # src/Appwrite/Platform/Workers/Deletes.php # src/Appwrite/Platform/Workers/Messaging.php # src/Appwrite/Platform/Workers/Usage.php # src/Appwrite/Platform/Workers/UsageHook.php # src/Appwrite/Specification/Format/OpenAPI3.php # src/Appwrite/Specification/Format/Swagger2.php # tests/e2e/Services/Account/AccountConsoleClientTest.php		2024-02-22 01:29:28 +13:00
..
api	Merge remote-tracking branch 'origin/main' into 1.5.x	2024-02-22 01:29:28 +13:00
shared	Merge remote-tracking branch 'origin/main' into 1.5.x	2024-02-22 01:29:28 +13:00
web	sync with 1.4	2023-10-02 17:02:48 +03:00
general.php	fix: move user and project logic from general to api hook	2024-02-16 17:58:51 +00:00
mock.php	Resolved merge conflicts	2023-11-14 14:29:46 +05:30