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

 Conflicts:
	.gitmodules
	Dockerfile
	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
	app/console
	composer.lock
This commit is contained in:
shimon
2023-02-19 10:51:50 +02:00
95 changed files with 450 additions and 506 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
namespace Tests\E2E\Scopes;
use Tests\E2E\Client;
use Utopia\Database\ID;
use Utopia\Database\Helpers\ID;
trait ProjectCustom
{