Jake Barnby f14c0cc0aa Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation ... # Conflicts: # app/config/specs/open-api3-latest-client.json # app/config/specs/open-api3-latest-console.json # app/config/specs/open-api3-latest-server.json # app/config/specs/swagger2-latest-client.json # app/config/specs/swagger2-latest-console.json # app/config/specs/swagger2-latest-server.json		2024-02-03 03:35:14 +13:00
..
api	Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation	2024-02-03 03:35:14 +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	sync with 1.4	2023-10-02 17:02:48 +03:00
general.php	Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa	2024-02-01 11:57:32 +01:00
mock.php	Resolved merge conflicts	2023-11-14 14:29:46 +05:30