# Conflicts: # .gitignore # frontend/api/class.ApiLogin.php # function.php # utils/Docker/docker-compose.yml