shimon 99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn ...

 Conflicts:

	.gitmodules

	Dockerfile

	app/console

	app/init.php

	composer.lock

	src/Appwrite/Platform/Services/Workers.php

	src/Appwrite/Platform/Tasks/Hamster.php

2024-01-02 11:49:23 +02:00

..

assets

sync with 1.4

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

config

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

2024-01-02 11:49:23 +02:00

console @ 1feecb22d4

Bump console to version 3.3.15

2023-12-29 19:27:44 +00:00

controllers

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

2024-01-02 11:49:23 +02:00

views

clean up

2023-10-25 15:06:54 +03:00

cli.php

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

2024-01-02 11:49:23 +02:00

http.php

chore: update database

2023-10-02 22:23:35 +00:00

init.php

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

2024-01-02 11:49:23 +02:00

preload.php

Fix startup errors

2022-11-12 14:35:42 +00:00

realtime.php

Merge pull request #7003 from appwrite/feat-query-metadata

2023-10-27 12:52:34 +13:00

worker.php

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

2024-01-02 11:49:23 +02:00