Jake Barnby b2e956a14d Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes ... # Conflicts: # .gitignore # app/cli.php # app/controllers/api/account.php # app/controllers/api/databases.php # app/controllers/api/projects.php # app/controllers/general.php # app/controllers/shared/api.php # app/init.php # app/realtime.php # app/worker.php # composer.json # composer.lock # src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php # src/Appwrite/Platform/Tasks/GetMigrationStats.php # src/Appwrite/Platform/Workers/Databases.php # src/Appwrite/Platform/Workers/Deletes.php # src/Appwrite/Platform/Workers/Hamster.php # tests/e2e/General/HTTPTest.php # tests/e2e/Services/Databases/DatabasesCustomServerTest.php # tests/e2e/Services/Projects/ProjectsConsoleClientTest.php		2024-04-30 19:40:47 +12:00
..
api	Merge branch 'main' into chore-sync-main-into-1.5.x	2024-04-23 23:43:53 +00:00
api.php	Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes	2024-04-30 19:40:47 +12:00