Neil Dorin a2ebeab839 Merge branch 'release/v1.4.33' into feature/ecs-1257 ... # Conflicts: # PepperDashEssentials/ControlSystem.cs # essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs		2020-02-26 10:35:56 -07: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 'release/v1.4.33' into feature/ecs-1257	2020-02-26 10:35:56 -07:00
Essentials Devices Common	Merge remote-tracking branch 'origin/development' into bugfix/ecs-1260	2020-02-18 15:52:11 -07:00
Essentials DM	Merge branch 'development' into bugfix/ecs-1255	2020-02-24 16:01:18 -07:00
pepperdashcore-builds@7db7cb27f6	Updates to PD.Core v1.0.34	2020-02-24 16:09:58 -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