prateek banga 8e1ef812d3 resolve merge conflicts

2023-08-14 21:59:24 +05:30

..

assets

Merge branch '1.3.x' into feat-13x-master-sync

2023-02-21 07:38:46 +05:45

config

Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x

2023-08-08 20:51:31 +00:00

console @ 9174d8f8cb

feat: revert changes

2023-07-20 01:13:46 +04:00

controllers

resolve merge conflicts

2023-08-14 21:59:24 +05:30

views

feat: update error page

2023-08-08 21:25:48 +00:00

workers

Merge branch '1.4.x' into cloud-1.4.x

2023-08-04 18:07:33 -07:00

cli.php

Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync

2023-07-10 03:06:48 +00:00

http.php

Merge tag '1.3.8' into cloud-1.3.x-2

2023-08-04 13:55:07 -07:00

init.php

fix test cases

2023-08-11 16:19:05 +05:30

preload.php

Fix startup errors

2022-11-12 14:35:42 +00:00

realtime.php

Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync

2023-02-16 00:29:37 +00:00

worker.php

fix logger optional

2023-07-12 07:17:40 +00:00