pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 12:06:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bugfix/ecs-895' into feature/ecs-877

Browse source 
# Conflicts:
#	PepperDashEssentials/Properties/AssemblyInfo.cs
#	PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
#	Release Package/PepperDashEssentials.cpz
#	Release Package/PepperDashEssentials.dll
This commit is contained in:
Neil Dorin 2018-10-08 13:30:18 -06:00
commit b793c04ad3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
View file

@ -272,8 +272,8 @@ namespace PepperDash.Essentials.Room.Config
[JsonProperty("deviceKey")]
public string DeviceKey { get; set; }
[JsonProperty("timoutMinutes")]
public int TimoutMinutes { get; set; }
[JsonProperty("timeoutMinutes")]
public int TimeoutMinutes { get; set; }
}
public class EssentialsRoomTechConfig