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

..

assets

Merge branch '1.3.x' into feat-13x-master-sync

2023-02-21 07:38:46 +05:45

config

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

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

console @ 88b6d59051

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

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

controllers

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

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

views

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

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

workers

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

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

cli.php

new usage integration

2023-09-04 16:52:19 +03:00

http.php

Allow any hostname, and serve API+Console by default

2023-09-05 17:02:07 +02:00

init.php

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

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

preload.php

Fix startup errors

2022-11-12 14:35:42 +00:00

realtime.php

Fix console db namespace

2023-08-21 15:53:30 -07:00

worker.php

new usage integration

2023-09-04 16:52:19 +03:00