Files
shimon f3508e1701 Merge branch 'master' of github.com:appwrite/appwrite into __stream
 Conflicts:
	.gitmodules
	Dockerfile
	app/config/services.php
	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
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/teams.php
	composer.json
	composer.lock
	src/Appwrite/Utopia/Response.php
2023-05-07 11:43:29 +03:00
..