1
0
Fork 0
mirror of synced 2024-07-03 13:41:01 +12:00
appwrite/app/controllers
fogelito c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
 Conflicts:
	app/controllers/general.php
	composer.json
	composer.lock
2022-08-17 21:04:23 +03:00
..
api Fix teams exception 2022-08-17 00:14:22 +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 remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix 2022-08-16 20:30:00 +12:00
general.php Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz 2022-08-17 21:04:23 +03:00
mock.php Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix 2022-08-16 20:30:00 +12:00