Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into devel

Conflicts: api.php index.php
2026-04-23 02:09:58 +01:00 · 2016-01-27 23:03:58 -06:00
parent c6c227de43 4b0e1d9ca2
commit fa6f0a42a5
11 changed files with 545 additions and 322 deletions
--- a/api.php
+++ b/api.php
@@ -1,6 +1,11 @@
+<<<<<<< HEAD
 <?php
    include('data.php');

    header('Content-type: application/json');
    echo json_encode($data);
+=======
+<?php 
+    echo exec("/usr/local/bin/chronometer.sh -j"); 
+>>>>>>> 4b0e1d9ca21302104fe9bca06d9b21a20f938caf
 ?>