Merge branch 'master' into release
This commit is contained in:
commit
ed93a61ac6
@ -28,7 +28,7 @@
|
|||||||
$context = stream_context_create($options);
|
$context = stream_context_create($options);
|
||||||
|
|
||||||
header('Content-Type: application/json');
|
header('Content-Type: application/json');
|
||||||
echo file_get_contents("http://192.168.0.25/public/pages/display/calendar.php?location", false, $context);
|
echo file_get_contents("http://192.168.0.25/stuff/calendar.php?location", false, $context);
|
||||||
|
|
||||||
else:
|
else:
|
||||||
?>
|
?>
|
||||||
|
Loading…
Reference in New Issue
Block a user