Merge branch 'dev' into 'sonar-fix'
# Conflicts: # smart-hut/src/components/dashboard/devices/Curtains.css
This commit is contained in:
commit
393e753b44
# Conflicts: # smart-hut/src/components/dashboard/devices/Curtains.css