Jake Barnby e9f75d32a1 Merge remote-tracking branch 'origin/master' into feat-graphql-support ... # Conflicts: # Dockerfile # app/config/errors.php # app/config/roles.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/controllers/api/graphql.php # app/controllers/shared/api.php # app/init.php # composer.lock # docker-compose.yml # src/Appwrite/Extend/Exception.php # src/Appwrite/Migration/Migration.php		2022-09-20 15:43:09 +12:00
..
avatars	format files in app, src, tests	2022-05-23 14:54:50 +00:00
locale	Update fr.json	2022-06-10 15:53:45 +02:00
specs	feat: generate latest specs	2022-09-14 17:18:25 +05:30
storage	chore: run linter	2022-06-20 11:24:05 +02:00
auth.php	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
collections.php	Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling	2022-09-13 20:14:42 +00:00
errors.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-09-20 15:43:09 +12:00
events.php	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
platforms.php	feat: update examples	2022-09-14 14:41:08 +05:30
providers.php	Sync master	2022-08-28 11:01:46 +12:00
roles.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-09-20 15:43:09 +12:00
runtimes.php	Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2	2022-08-16 14:49:08 +00:00
scopes.php	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
services.php	logger moved to App::shutdown	2022-07-07 18:00:44 +03:00
variables.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-09-20 15:43:09 +12:00