Jake Barnby e9f75d32a1 Merge remote-tracking branch 'origin/master' into feat-graphql-support ... # Conflicts: # Dockerfile # app/config/errors.php # app/config/roles.php # 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 # app/controllers/api/graphql.php # app/controllers/shared/api.php # app/init.php # composer.lock # docker-compose.yml # src/Appwrite/Extend/Exception.php # src/Appwrite/Migration/Migration.php		2022-09-20 15:43:09 +12:00
..
api	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-09-20 15:43:09 +12:00
shared	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-09-20 15:43:09 +12:00
web	Rename collection to collectionId on the Console	2022-09-14 00:53:37 +00:00
general.php	Fix version matching for 0.15.X request & response	2022-09-13 20:42:50 +00:00
mock.php	Merge pull request #3682 from appwrite/0.16.x	2022-09-14 18:10:41 +05:30