shimon 1af48bd895 Merge branch 'master' of github.com:appwrite/appwrite into __stream ...

 Conflicts:

	.gitmodules

	app/config/errors.php

	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

	composer.json

	composer.lock

	docker-compose.yml

	src/Appwrite/Extend/Exception.php

2023-01-11 16:31:26 +02:00

..

benchmarks

Add account benchmarks

2022-07-20 01:30:01 +12:00

e2e

Merge branch 'master' of github.com:appwrite/appwrite into __stream

2023-01-11 16:31:26 +02:00

extensions

Merge remote-tracking branch 'origin/0.16.x' into feat-allow-automatic-test-retries

2022-08-30 23:14:28 +12:00

resources

Merge branch 'master' of github.com:appwrite/appwrite into __stream

2023-01-11 16:31:26 +02:00

unit

Fix failing test

2022-12-27 09:09:47 +01:00