Matteo Omenetti 2f3ede238f Merge branch 'dev' into 'dashboard-videocamera' ... # Conflicts: # smart-hut/src/components/dashboard/devices/Device.js		2020-04-22 16:35:09 +02:00
..
devices	Merge branch 'dev' into 'dashboard-videocamera'	2020-04-22 16:35:09 +02:00
AutomationsPanel.js	Basic Tabs system	2020-04-14 14:58:03 +02:00
DevicePanel.js	Able to add scenes and get scenes in a right way	2020-04-21 14:58:36 +02:00
NewSceneDevice.js	Able to add scenes and get scenes in a right way	2020-04-21 14:58:36 +02:00
ScenesPanel.js	Able to add scenes and get scenes in a right way	2020-04-21 14:58:36 +02:00