shimon f477be7521 Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models ... Conflicts: composer.json		2024-01-31 20:28:03 +02:00
..
api	Merge pull request #7067 from appwrite/feat-php-8-1	2024-02-01 01:47:57 +13:00
shared	Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing	2024-01-25 17:44:05 +02:00
web
general.php	Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models	2024-01-31 20:28:03 +02:00
mock.php	Resolved merge conflicts	2023-11-14 14:29:46 +05:30