shimon 2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label ...

 Conflicts:

	app/controllers/api/account.php

	app/controllers/api/users.php

	composer.json

	composer.lock

2022-08-17 10:05:37 +03:00

..

config

Merge pull request #3656 from appwrite/feat-functions-console-logs

2022-08-16 23:23:53 +03:00

controllers

Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label

2022-08-17 10:05:37 +03:00

db/DBIP

Merge branch 'appwrite:master' into feat-XXX-authentik-oauth

2022-07-06 11:02:59 +02:00

tasks

sync: with master

2022-07-25 12:17:08 +02:00

views

Merge pull request #3656 from appwrite/feat-functions-console-logs

2022-08-16 23:23:53 +03:00

workers

Merge pull request #3656 from appwrite/feat-functions-console-logs

2022-08-16 23:23:53 +03:00

cli.php

format files in app, src, tests

2022-05-23 14:54:50 +00:00

executor.php

Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2

2022-08-16 14:49:08 +00:00

http.php

Merge branch 'appwrite:master' into feat-XXX-authentik-oauth

2022-07-06 11:02:59 +02:00

init.php

Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param

2022-08-14 19:43:53 +03:00

preload.php

format files in app, src, tests

2022-05-23 14:54:50 +00:00

realtime.php

Bug fixing afte merge

2022-07-25 12:37:29 +00:00