Skip to content
Commit 7b9c2748 authored by Marek Kadlečík's avatar Marek Kadlečík
Browse files

Merge branch 'general_fix' into main

# Conflicts:
#	gaming-service/src/main/java/cz/muni/fi/pa165/facade/BaseFacadeImpl.java
#	gaming-service/src/main/java/cz/muni/fi/pa165/facade/PlayerFacadeImpl.java
#	gaming-service/src/main/java/cz/muni/fi/pa165/facade/TournamentFacadeImpl.java
#	pom.xml
parents 2874dd62 3ce2bfa4
Loading
Loading
Loading
Pipeline #141184 passed with stage
in 1 minute and 52 seconds