Jake Barnby e865f77a6b Merge remote-tracking branch 'origin/master' into feat-graphql-support ... # Conflicts: # CONTRIBUTING.md # app/config/errors.php # app/controllers/api/account.php # app/controllers/api/graphql.php # app/init.php # composer.json # composer.lock		2022-06-20 11:15:22 +12:00
..
account.php	Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter	2022-05-31 13:48:05 +00:00
avatars.php	remove unecessary semi colons	2022-05-31 14:24:01 +00:00
database.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-06-20 11:15:22 +12:00
functions.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-06-20 11:15:22 +12:00
graphql.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-06-20 11:15:22 +12:00
health.php	format files in app, src, tests	2022-05-23 14:54:50 +00:00
locale.php	style: fix some styles	2022-05-08 17:10:56 +02:00
projects.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-06-20 11:15:22 +12:00
storage.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-06-20 11:15:22 +12:00
teams.php	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-06-20 11:15:22 +12:00
users.php	remove unecessary semi colons	2022-05-31 14:24:01 +00:00