Pi-Hole/web
1
0 Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-10-08 21:49:48 +01: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 committed 2017-02-28 13:49:34 +01:00
2 parents aacc215394 3b5578321a
commit 7a73053bfd
15 files changed
+1784 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

api.php
+1 -1
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");