Jake Barnby 163782d4cd Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix ... # Conflicts: # composer.lock # public/dist/scripts/app-all.js # public/dist/scripts/app-dep.js # public/dist/scripts/app.js		2022-08-17 15:34:41 +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	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	Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes	2022-08-14 23:11:05 +12: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