Jake Barnby 8841f8fe76 Merge remote-tracking branch 'origin/master' into feat-graphql-support ... # Conflicts: # app/controllers/general.php # app/controllers/shared/api.php # composer.json # composer.lock		2022-08-22 21:13:29 +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	chore: update specs	2022-07-20 17:57:12 +02: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 branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
errors.php	Add invalid query exception	2022-07-14 15:57:51 +12:00
events.php	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
platforms.php	Update platforms.php	2022-07-20 16:59:03 +01:00
providers.php	Merge pull request #3522 from wess/feat-etsy-auth	2022-08-13 13:05:43 +03:00
roles.php	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
runtimes.php	fix linter issues in app directory	2022-05-30 17:41:25 +00:00
scopes.php	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
services.php	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
variables.php	sync: with master	2022-07-25 12:17:08 +02:00