102c86b2a6
Conflicts: Dockerfile 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/worker.php composer.json composer.lock src/Appwrite/Event/Mail.php src/Appwrite/Migration/Migration.php src/Appwrite/Migration/Version/V20.php src/Appwrite/Platform/Services/Tasks.php src/Appwrite/Platform/Services/Workers.php src/Appwrite/Platform/Workers/Builds.php src/Appwrite/Platform/Workers/Deletes.php src/Appwrite/Platform/Workers/Mails.php |
||
---|---|---|
.. | ||
api | ||
shared | ||
web | ||
general.php | ||
mock.php |