Merge branch 'development' into DataBase
# Conflicts: # src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java # src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/AzureDB.java # src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/OracleDB.java # src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java # src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java # src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java # src/main/resources/player/appSettings.json # src/main/resources/player/playerAccount.json
No related branches found
No related tags found
Checking pipeline status