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

..

Essentials/PepperDashEssentials

Removes essentials-framework as a submodule and brings the files back into the main repo

2019-07-09 17:21:53 -06:00

Essentials Core

Merge branch 'development' into feature/ecs-1209

2020-03-10 14:23:17 -06:00

Essentials Devices Common

Merge branch 'development' into feature/ecs-1209

2020-03-10 14:23:17 -06:00

Essentials DM

Merge branch 'development' into feature/action-testing

2020-03-06 12:46:37 -07:00

pepperdashcore-builds @ 15206840b3

updates to PD.Core v1.0.35 adds test text file to trigger CI builds

2020-03-06 12:04:51 -07:00

Essentials Framework.sln

Removes essentials-framework as a submodule and brings the files back into the main repo

2019-07-09 17:21:53 -06:00