pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-09 17:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2

Browse Source 
Conflicts:
	Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs
This commit is contained in:
Neil Dorin
2017-09-20 18:19:03 -06:00
parent c045c8e7a6 82465e8789
commit ff5fab4984
17 changed files with 2458 additions and 1816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/PepperDashEssentials/ControlSystem.cs
View File

@@ -31,7 +31,7 @@ namespace PepperDash.Essentials
{
//CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Reloads configuration file",
// ConsoleAccessLevelEnum.AccessOperator);
//CrestronConsole.AddNewConsoleCommand(s => TearDown(), "ungo", "Reloads configuration file",
//CrestronConsole.AddNewConsoleCommand(s => TearDown(), "ungo", "Unloads configuration file",
// ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(s =>
{