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

..

account.php

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

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

avatars.php

purgeCached changes

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

console.php

sync with 1.4

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

databases.php

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

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

functions.php

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

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

graphql.php

sync with 1.4

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

health.php

Addressed PR comments

2023-11-17 19:29:57 +05:30

locale.php

sync with 1.4

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

messaging.php

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

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

migrations.php

TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE

2023-12-06 15:10:40 +01:00

project.php

rename stats collection

2023-12-18 10:11:10 +00:00

projects.php

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

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

proxy.php

TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE

2023-12-06 15:10:40 +01:00

storage.php

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

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

teams.php

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

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

users.php

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

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

vcs.php

TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE

2023-12-06 15:10:40 +01:00