shimon 3f1850f4a7 Merge remote-tracking branch 'origin/1.5.x-response-request-models' into 1.5.x-response-request-models ...

# Conflicts:
#	Dockerfile
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	composer.lock
#	src/Appwrite/Migration/Version/V20.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Services/Workers.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Mails.php

2024-01-31 20:25:12 +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 1.5.x-response-request-models

2024-01-31 20:21:18 +02:00

console @ 0a007a3b1b

Revert console changes

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

controllers

Merge branch '1.5.x' into 1.5.x-response-request-models

2024-01-25 12:27:00 +00:00

views

Merge branch 'main' of github.com:appwrite/appwrite into 1.5.x-response-request-models

2024-01-31 20:21:18 +02: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 1.5.x-response-request-models

2024-01-31 20:21:18 +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

Merge remote-tracking branch 'origin/1.5.x-response-request-models' into 1.5.x-response-request-models

2024-01-31 20:25:12 +02:00