Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-15 07:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into new/FTL-integration

Browse Source 
Conflicts:
	api.php
This commit is contained in:
DL6ER
2017-02-28 13:49:34 +01:00
parent aacc215394 3b5578321a
commit 7a73053bfd
15 changed files with 1784 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api.php
View File

@@ -7,8 +7,8 @@
* Please see LICENSE file for your rights under this license */
$api = true;
require("scripts/pi-hole/php/FTL.php");
if(testFTL() && !isset($_GET["PHP"]))
{
require("api_FTL.php");