appwrite/app/controllers
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
..
api Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge 2022-08-16 19:20:26 +12:00
shared Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge 2022-08-16 19:20:26 +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