Merge branch 'master' into release

This commit is contained in:
Jason Williams 2019-02-07 19:33:54 -07:00
commit ed93a61ac6

View File

@ -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:
?> ?>