Merge branch 'master' into release

This commit is contained in:
Jason Williams 2018-08-26 21:13:03 -06:00
commit 359d03faca

View File

@ -15,7 +15,7 @@
} }
header('Content-Type: application/json'); header('Content-Type: application/json');
echo json_encode($output['device_tracker.jasonsphone_jason']); echo json_encode($output['device_tracker.google_maps_106661122982066747046']);
exit(); exit();
elseif (isset($_GET["calendar"])): elseif (isset($_GET["calendar"])):