Conflicts: .gitmodules Dockerfile app/console app/init.php composer.lock src/Appwrite/Platform/Services/Workers.php src/Appwrite/Platform/Tasks/Hamster.php |
||
---|---|---|
.. | ||
api | ||
shared | ||
web | ||
general.php | ||
mock.php |
Conflicts: .gitmodules Dockerfile app/console app/init.php composer.lock src/Appwrite/Platform/Services/Workers.php src/Appwrite/Platform/Tasks/Hamster.php |
||
---|---|---|
.. | ||
api | ||
shared | ||
web | ||
general.php | ||
mock.php |