Commit 3da52c5e authored Apr 23, 2023 by Marek Skácelík

Merge branch 'milestone-3' into 'updateSmartMeter'

# Conflicts:
#   core/src/main/java/cz/muni/fi/pa165/core/user/UserController.java