Skip to content
Commit 90e65e3f authored by Filip Bugoš's avatar Filip Bugoš
Browse files

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

# Conflicts:
#	core/src/main/java/cz/muni/fi/pa165/core/house/HouseFacade.java
#	core/src/main/java/cz/muni/fi/pa165/core/metrics/MetricsFacade.java
#	core/src/main/java/cz/muni/fi/pa165/core/user/UserFacade.java
#	core/src/test/java/cz/muni/fi/pa165/core/user/UserControllerTest.java
parents 84627df2 8ef8ff5e
Loading
Loading
Loading
Loading