1
0
Fork 0
mirror of synced 2024-07-04 22:20:45 +12:00
appwrite/app/controllers
Jake Barnby f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
#	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/init.php
#	app/tasks/sdks.php
#	composer.lock
#	docker-compose.yml
2022-11-16 19:37:35 +13:00
..
api Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 2022-11-16 19:37:35 +13:00
shared Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 2022-11-16 19:37:35 +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