Merge remote-tracking branch 'origin/master' into feat-graphql-support

# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/general.php
#	app/init.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
This commit is contained in:
Jake Barnby
2022-07-01 00:05:44 +12:00
2112 changed files with 47061 additions and 4973 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
<directory>./tests/e2e/Services/Account</directory>
<directory>./tests/e2e/Services/Realtime</directory>
<directory>./tests/e2e/Services/Avatars</directory>
<directory>./tests/e2e/Services/Database</directory>
<directory>./tests/e2e/Services/Databases</directory>
<directory>./tests/e2e/Services/GraphQL</directory>
<directory>./tests/e2e/Services/Health</directory>
<directory>./tests/e2e/Services/Locale</directory>