fogelito 72a30cf65f Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout ...

 Conflicts:

	app/controllers/api/databases.php

	app/init.php

	composer.json

	composer.lock

	tests/e2e/General/UsageTest.php

	tests/e2e/Services/Account/AccountCustomClientTest.php

	tests/e2e/Services/Databases/DatabasesBase.php

	tests/e2e/Services/Databases/DatabasesCustomServerTest.php

	tests/e2e/Services/Functions/FunctionsCustomServerTest.php

	tests/e2e/Services/Storage/StorageBase.php

	tests/e2e/Services/Storage/StorageCustomClientTest.php

	tests/e2e/Services/Storage/StorageCustomServerTest.php

	tests/e2e/Services/Teams/TeamsBase.php

	tests/e2e/Services/Teams/TeamsBaseClient.php

	tests/e2e/Services/Webhooks/WebhooksBase.php

	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php

	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php

2023-02-15 11:22:35 +02:00

..

assets

Update DBIP Database

2023-01-26 14:57:02 +00:00

config

Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout

2023-02-15 11:22:35 +02:00

console @ 5e2a40c1e3

env variables

2023-02-14 09:39:19 +02:00

controllers

Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout

2023-02-15 11:22:35 +02:00

tasks

Update for SDK generator changes

2022-12-19 19:06:57 +13:00

views

Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout

2023-02-15 11:22:35 +02:00

workers

Fix audit

2023-02-15 17:39:15 +13:00

cli.php

format files in app, src, tests

2022-05-23 14:54:50 +00:00

executor.php

Convert _APP_STORAGE_DEVICE env var to lowercase

2023-01-11 11:41:26 -08:00

http.php

add helpers namespace

2023-02-13 17:43:58 +02:00

init.php

Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout

2023-02-15 11:22:35 +02:00

preload.php

feat: update database library

2022-10-31 12:02:51 +00:00

realtime.php

Merge remote-tracking branch 'origin/master' into feat-technical-debt-2

2023-02-14 14:22:08 +13:00