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
..
dist	Merge pull request #3825 from appwrite/update-team-membership	2022-09-14 10:23:13 +02:00
fonts	fix(ui): missing icons	2022-04-21 12:51:46 +02:00
images	Merge remote-tracking branch 'origin/master' into feat-graphql-support	2022-08-22 21:13:29 +12:00
scripts	Merge pull request #3825 from appwrite/update-team-membership	2022-09-14 10:23:13 +02:00
styles	Image covering css bug fix	2022-09-06 14:52:03 +00:00