shimon c8eea7dd11 Merge branch 'master' of github.com:appwrite/appwrite into feat-usage-1.4 ...

 Conflicts:

	.gitmodules

	Dockerfile

	app/console

	composer.lock

2023-09-20 10:37:37 +03:00

..

compose.phtml

Merge branch 'master' of github.com:appwrite/appwrite into feat-usage-1.4

2023-09-20 10:37:37 +03:00

env.phtml

Added new templates

2020-07-29 09:56:39 +03:00