fogelito 9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1 ... Conflicts: app/controllers/api/databases.php app/controllers/api/projects.php app/controllers/api/users.php composer.json composer.lock		2024-01-29 08:50:53 +02:00
..
api	Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1	2024-01-29 08:50:53 +02:00
shared	Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x	2024-01-24 11:24:59 +01:00
web	sync with 1.4	2023-10-02 17:02:48 +03:00
general.php	Upgrade base:0.7.2	2024-01-24 10:37:28 +02:00
mock.php	Resolved merge conflicts	2023-11-14 14:29:46 +05:30