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
..
avatars	Revert "Pint linter ran"	2023-08-24 01:53:52 +05:30
locale	Merge branch '1.5.x' into sync-main-with-1.5.x	2024-01-24 12:06:22 +01:00
specs	Update specs	2024-02-20 23:23:07 +13:00
storage	adding audio/x-hx-aac-adts as well	2023-07-25 01:08:46 +00:00
auth.php	PR review changes	2024-01-22 14:30:11 +00:00
collections.php	Merge remote-tracking branch 'origin/main' into 1.5.x	2024-02-22 01:29:28 +13:00
errors.php	Merge remote-tracking branch 'origin/main' into 1.5.x	2024-02-22 01:29:28 +13:00
events.php	chore: fix token event	2024-01-16 10:40:49 +00:00
oAuthProviders.php	fix: base changed	2024-01-03 11:20:59 +05:30
platforms.php	chore: bump console version	2024-01-24 18:52:53 +01:00
regions.php	Make self-hosted and cloud specs consistent	2024-02-20 23:15:46 +13:00
roles.php	chore: rename new scopes	2024-01-17 11:17:03 +00:00
runtimes-v2.php	Make v2 functions work again	2023-09-04 19:53:25 +02:00
runtimes.php	Make self-hosted and cloud specs consistent	2024-02-20 23:15:46 +13:00
scopes.php	chore: rename new scopes	2024-01-17 11:17:03 +00:00
services.php	Resolved merge conflicts	2023-11-14 14:29:46 +05:30
usage.php	Revert "Pint linter ran"	2023-08-24 01:53:52 +05:30
variables.php	Merge main	2024-02-12 14:18:19 +13:00