Merge branch 'master' into release
This commit is contained in:
commit
359d03faca
@ -15,7 +15,7 @@
|
||||
}
|
||||
|
||||
header('Content-Type: application/json');
|
||||
echo json_encode($output['device_tracker.jasonsphone_jason']);
|
||||
echo json_encode($output['device_tracker.google_maps_106661122982066747046']);
|
||||
exit();
|
||||
|
||||
elseif (isset($_GET["calendar"])):
|
||||
|
Loading…
Reference in New Issue
Block a user