Skip to content
Snippets Groups Projects
Commit b3369341 authored by Seidel Leon's avatar Seidel Leon
Browse files

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java
parents 50e9d60f 441b6238
No related branches found
No related tags found
1 merge request!7Dev in Main Merge
Showing
with 143 additions and 29 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