Jake Barnby 0b01f7140f Merge remote-tracking branch 'origin/main' into 1.5.x ... # Conflicts: # app/config/errors.php # composer.lock # src/Appwrite/Extend/Exception.php		2023-11-21 00:19:17 +13:00
..
api	Merge remote-tracking branch 'origin/main' into 1.5.x	2023-11-21 00:19:17 +13:00
shared	Ensure usage endpoints don't throw 500 when usage is disabled	2023-11-06 21:28:45 +00:00
web	sync with 1.4	2023-10-02 17:02:48 +03:00
general.php	Fix incorrect general_protocol_unsupported error	2023-10-31 18:31:36 +00:00
mock.php	Update mock.php	2023-11-02 17:07:16 +00:00