fogelito c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz ...

 Conflicts:

	app/controllers/general.php

	composer.json

	composer.lock

2022-08-17 21:04:23 +03: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

Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix

2022-08-17 15:34:41 +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

filters for collections

2022-08-15 18:03:03 +03:00

errors.php

Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix

2022-08-16 20:30:00 +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 branch 'appwrite:master' into feat-disqus-Oauth-provider

2022-08-05 21:24:19 +05:30

roles.php

Self review

2022-08-15 19:20:10 +12: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