Jake Barnby 7fe14ca10b Merge remote-tracking branch 'origin/master' into sync-master ...

# Conflicts:
#	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/console
#	app/controllers/api/storage.php
#	composer.lock

2023-04-12 00:50:31 +12:00

..

avatars

format files in app, src, tests

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

locale

Merge branch 'master' into fix-4782-email-body-fr-translation

2022-12-21 11:45:50 -08:00

specs

Merge remote-tracking branch 'origin/master' into sync-master

2023-04-12 00:50:31 +12:00

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/1.3.x' into feat-relations-2

2023-03-25 15:32:55 +13:00

errors.php

Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2

2023-04-11 17:25:26 +12:00

events.php

fix: wrong team event descriptions

2023-03-23 10:52:43 +01:00

platforms.php

Merge remote-tracking branch 'origin/master' into sync-master

2023-04-12 00:50:31 +12:00

providers.php

fixed typo

2022-09-21 22:55:21 +05:30

regions.php

Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"

2022-09-30 14:22:11 +02:00

roles.php

Add graphql scope back for guests

2022-09-21 18:54:47 +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

fix: typo

2023-03-31 18:47:00 +02:00

variables.php

Convert _APP_STORAGE_DEVICE env var to lowercase

2023-01-11 11:41:26 -08:00