Skip to content
Commit 33c9e67c 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 a9f9d602 90e65e3f
Pipeline #222219 passed with stages
in 2 minutes and 41 seconds
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