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

Browse Source

 Conflicts:

	app/controllers/api/databases.php

	composer.json

	composer.lock

	tests/e2e/Services/Databases/DatabasesBase.php

...

This commit is contained in:

fogelito

2023-08-01 11:25:21 +03:00

parent 59dd6bfbcc 887abad190

commit 632d41ec6c

6764 changed files with 55688 additions and 4874 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

app/controllers/api/databases.php

+1351 -214

File diff suppressed because it is too large Load Diff