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 'development' into JTAChanges

Browse source 
# Conflicts:
#	essentials-framework
This commit is contained in:
Jason T Alborough 2018-08-13 14:51:55 -04:00
commit a6df8f908b
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PepperDashEssentials/Room/Cotija/CotijaSystemController.cs
View file

@ -450,6 +450,11 @@ namespace PepperDash.Essentials
/// <param name="content"></param>
void HandleHeartBeat(JToken content)
{
SendMessageToServer(JObject.FromObject(new
{
type = "/heartbeat-ack"
}));
var code = content["userCode"];
if(code != null)
{