Neil Dorin f27b6fadb9 Merge branch 'development' into feature/ecs-1209 ... # Conflicts: # PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs # PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs # essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs # essentials-framework/Essentials Devices Common/Essentials Devices Common/Power Controllers/Digitallogger.cs		2020-03-10 14:23:17 -06:00
..
Behaviours	Mega refactor in progress	2019-10-23 22:29:04 -06:00
EssentialsRoomBase.cs	Merge branch 'development' into feature/ecs-1209	2020-03-10 14:23:17 -06:00
Interfaces.cs	Updates to IRunRouteAction to require specification of sourceListKey	2019-12-04 22:36:25 -07:00
iOccupancyStatusProvider.cs	Mega refactor in progress	2019-10-23 22:29:04 -06:00
Room.cs	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00