Jake Barnby cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes ... # 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 # composer.lock # public/dist/scripts/app-all.js # public/dist/scripts/app-dep.js # public/dist/scripts/app.js # public/dist/styles/default-ltr.css # public/dist/styles/default-rtl.css # public/scripts/dependencies/appwrite.js		2022-08-15 12:05:52 +12:00
..
config	Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes	2022-08-14 23:11:05 +12:00
controllers	Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes	2022-08-15 12:05:52 +12:00
db/DBIP	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
tasks	Update database query syntax	2022-08-14 05:44:55 +00:00
views	Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes	2022-08-15 12:05:52 +12:00
workers	ID and test fixes	2022-08-15 02:22:38 +12:00
cli.php	format files in app, src, tests	2022-05-23 14:54:50 +00:00
executor.php	Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes	2022-08-13 06:21:50 +03:00
http.php	ID updates	2022-08-14 22:33:36 +12:00
init.php	Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes	2022-08-15 12:05:52 +12:00
preload.php	format files in app, src, tests	2022-05-23 14:54:50 +00:00
realtime.php	ID and test fixes	2022-08-15 02:22:38 +12:00