Merge branch 'development' of gitlab.mi.hdm-stuttgart.de:ms622/battlearena into development (125a1777) · Commits · Scherbaum Maximilian / BattleArena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BattleArena
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

125a1777

Commit 125a1777 authored 1 year ago by Tran Peter

Downloads
- Plain Diff

Merge branch 'development' of gitlab.mi.hdm-stuttgart.de:ms622/battlearena into development

parents 0d840a74 7c33f665

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java 1 addition, 2 deletions

...rt/battlearena/Model/DataStorage/Classes/Persistence.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/StartupThread.java 28 additions, 0 deletions

.../battlearena/Model/DataStorage/Classes/StartupThread.java
src/main/resources/player/appSettings.json 4 additions, 0 deletions

src/main/resources/player/appSettings.json

with 33 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment