1
0
Fork 0
mirror of synced 2024-07-06 23:21:05 +12:00
appwrite/app/controllers
Jake Barnby 03f85c3b74
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# 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
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/Provider.php
2022-11-01 11:07:51 +13:00
..
api Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
shared Move shutdown hook to graphql controller 2022-10-28 10:04:31 +13:00
web Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region" 2022-09-30 14:22:11 +02:00
general.php Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 2022-11-01 11:07:51 +13:00
mock.php Merge pull request #3682 from appwrite/0.16.x 2022-09-14 18:10:41 +05:30