Jacob Salvi 7f34e2b391 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 51-users-can-add-smart-curtains-blinds ... # Conflicts: # .gitlab-ci.yml		2020-04-09 14:27:12 +02:00
..
inf/sa4/sanmarinoes/smarthut	Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 51-users-can-add-smart-curtains-blinds	2020-04-09 14:27:12 +02:00