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

 Conflicts:

	.gitmodules

	app/config/specs/open-api3-latest-console.json

	app/config/specs/swagger2-latest-console.json

	app/console

	app/init.php

	app/views/install/compose.phtml

	app/workers/functions.php

	composer.lock

2023-09-12 10:41:40 +03:00

..

general

feat: update error page

2023-08-08 21:25:48 +00:00

install

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

2023-09-12 10:41:40 +03:00

proxy.phtml

Fix code style in views

2019-10-01 02:16:59 +03:00