Conflicts: .gitmodules CHANGES.md Dockerfile composer.lock src/Appwrite/Migration/Migration.php |
||
---|---|---|
.. | ||
FunctionsBase.php | ||
FunctionsConsoleClientTest.php | ||
FunctionsCustomClientTest.php | ||
FunctionsCustomServerTest.php |
Conflicts: .gitmodules CHANGES.md Dockerfile composer.lock src/Appwrite/Migration/Migration.php |
||
---|---|---|
.. | ||
FunctionsBase.php | ||
FunctionsConsoleClientTest.php | ||
FunctionsCustomClientTest.php | ||
FunctionsCustomServerTest.php |