1
0
Fork 0
mirror of synced 2024-10-05 12:43:13 +13:00
appwrite/app/controllers
Jake Barnby b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
..
api Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 2024-04-30 19:40:47 +12:00
shared Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 2024-04-30 19:40:47 +12:00
web fix: add mfa path to console 2024-02-23 12:13:22 +01:00
general.php Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 2024-04-30 19:40:47 +12:00
mock.php Fix format 2024-04-01 13:08:46 +02:00