Skip to content
Snippets Groups Projects
Commit e5796e73 authored by Schneider Stefan's avatar Schneider Stefan
Browse files

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

# Conflicts:
#	sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java
parents b4b1f27e aedebba2
No related branches found
No related tags found
1 merge request!7Dev in Main Merge
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment