Khushboo Verma 1a32f16962 Resolved merge conflicts

2023-04-13 22:55:55 +05:30

..

assets

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

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

config

Resolved merge conflicts

2023-04-13 22:55:55 +05:30

console @ 5e2a40c1e3

feat: upgrade to console 2.3.3

2023-04-12 18:23:09 +02:00

controllers

Resolved merge conflicts

2023-04-13 22:55:55 +05:30

tasks

Merge pull request #5339 from appwrite/feat-add-version

2023-04-12 01:56:29 +12:00

views

add restart policy for worker-messaging container

2023-01-12 06:51:50 +00:00

workers

Resolved merge conflicts

2023-04-13 22:55:55 +05:30

cli.php

format files in app, src, tests

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

executor.php

fix: implement new framework changes

2023-03-01 17:30:36 +05:30

http.php

Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2

2023-03-24 20:53:41 +13:00

init.php

chore: prepare 1.3.1 release

2023-04-12 18:13:49 +02:00

preload.php

feat: update database library

2022-10-31 12:02:51 +00:00

realtime.php

Merge remote-tracking branch 'origin/master' into feat-technical-debt-2

2023-02-14 14:22:08 +13:00