Skip to content
Commit 3da52c5e authored by Marek Skácelík's avatar Marek Skácelík
Browse files

Merge branch 'milestone-3' into 'updateSmartMeter' 

# Conflicts:
#   core/src/main/java/cz/muni/fi/pa165/core/user/UserController.java
parents 0af78709 06094e60
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment