shimon 893b1d0ba7 Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers ...

 Conflicts:

	.gitmodules

	app/controllers/api/functions.php

	app/controllers/api/health.php

	app/init.php

	app/views/install/compose.phtml

	composer.lock

	src/Appwrite/Migration/Migration.php

	src/Appwrite/Platform/Workers/Builds.php

	src/Appwrite/Platform/Workers/Deletes.php

	src/Appwrite/Platform/Workers/Functions.php

	src/Executor/Executor.php

2023-10-11 12:08:13 +03:00

..

account.php

sync with 1.4

2023-10-03 19:50:48 +03:00

avatars.php

sync with 1.4

2023-10-02 17:02:48 +03:00

console.php

sync with 1.4

2023-10-02 17:02:48 +03:00

databases.php

tests fix

2023-10-10 21:02:24 +03:00

functions.php

queueForBuilds fix via functions controller

2023-10-09 13:16:05 +03:00

graphql.php

sync with 1.4

2023-10-02 17:02:48 +03:00

health.php

sync with 1.4

2023-10-03 19:50:48 +03:00

locale.php

sync with 1.4

2023-10-02 17:02:48 +03:00

migrations.php

migrations worker

2023-10-01 20:39:26 +03:00

project.php

sync with 1.4

2023-10-02 17:02:48 +03:00

projects.php

Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers

2023-10-11 12:08:13 +03:00

proxy.php

Merge pull request #6059 from appwrite/fix-smtp

2023-08-30 16:09:10 +02:00

storage.php

sync with 1.4

2023-10-03 19:50:48 +03:00

teams.php

sync with 1.4

2023-10-02 17:02:48 +03:00

users.php

tests fix

2023-10-10 21:02:24 +03:00

vcs.php

queueForBuilds fix via functions controller

2023-10-09 13:28:06 +03:00