Matej Bačo 2e00fd5d4f Update after merge conflicts.

2022-08-31 13:35:42 +00:00

..

config

Update after merge conflicts.

2022-08-31 13:35:42 +00:00

controllers

Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2

2022-08-31 13:33:18 +00:00

db/DBIP

Merge branch 'appwrite:master' into feat-XXX-authentik-oauth

2022-07-06 11:02:59 +02:00

tasks

Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys

2022-08-27 20:03:15 +00:00

views

Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2

2022-08-31 13:33:18 +00:00

workers

PR review changes

2022-08-30 12:30:52 +00:00

cli.php

format files in app, src, tests

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

executor.php

Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes

2022-08-19 16:20:19 +12:00

http.php

compression attribute on default bucket

2022-08-31 02:29:06 +00:00

init.php

Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support

2022-08-31 13:21:45 +00:00

preload.php

format files in app, src, tests

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

realtime.php

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

2022-08-19 16:49:34 +12:00