fogelito a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing ...

 Conflicts:

	app/controllers/api/account.php

	composer.json

	composer.lock

	src/Appwrite/Platform/Tasks/CalcTierStats.php

	tests/e2e/Services/Account/AccountBase.php

2024-01-25 17:44:05 +02:00

..

assets

sync with 1.4

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

config

Merge branch '1.5.x' into sync-main-with-1.5.x

2024-01-24 12:06:22 +01:00

console @ 0a007a3b1b

Revert console changes

2024-01-23 09:09:22 +00:00

controllers

Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing

2024-01-25 17:44:05 +02:00

views

Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x

2024-01-24 11:24:59 +01:00

cli.php

Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing

2024-01-25 17:44:05 +02:00

http.php

purgeCached changes

2023-12-14 15:32:06 +02:00

init.php

Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing

2024-01-25 17:44:05 +02:00

preload.php

Revert "Pint linter ran"

2023-08-24 01:53:52 +05:30

realtime.php

Fix failing tests

2024-01-15 14:37:47 +00:00

worker.php

fix: workers

2024-01-24 12:29:36 +01:00