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

..

general

fix: remove layout

2022-11-17 13:37:59 +01:00

install

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

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

proxy.phtml

Fix code style in views

2019-10-01 02:16:59 +03:00