Skip to content
Snippets Groups Projects
Commit 4b07600c authored by Gehrung Jonas's avatar Gehrung Jonas
Browse files

Merge branch 'development' into 'sound'

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
#   src/main/resources/player/appSettings.json
parents a93d8d14 3d20f669
No related branches found
Tags v0.4.6
Loading
Showing
with 44 additions and 55 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 to comment