Neil Dorin
|
676526ed48
|
Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967
# Conflicts:
# PepperDashEssentials/AppServer/CotijaSystemController.cs
# PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
# PepperDashEssentials/ControlSystem.cs
# PepperDashEssentials/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
# PepperDashEssentials/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs
# PepperDashEssentials/Properties/AssemblyInfo.cs
# PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
# devjson commands.json
|
2018-12-12 13:34:32 -07:00 |
|