Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes ... # 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 # app/controllers/api/account.php # app/controllers/api/users.php # app/controllers/shared/api.php # app/workers/deletes.php # composer.lock # docker-compose.yml # phpunit.xml # src/Appwrite/Event/Delete.php		2022-08-19 16:20:19 +12:00
..
api	Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes	2022-08-19 16:20:19 +12:00
shared	Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes	2022-08-19 16:20:19 +12:00
web	Merge branch 'master' into feat-simplify-exceptions	2022-08-08 15:03:01 +01:00
general.php	Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge	2022-08-16 19:20:26 +12:00
mock.php	feat: exceptions on more files	2022-08-14 12:26:12 +05:30