Conflicts:

api.php
	scripts/pi-hole/php/FTL.php
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
This commit is contained in:
DL6ER
2017-02-19 14:17:52 +01:00
parent aabff35bef
commit f88092175e
9 changed files with 347 additions and 249 deletions

View File

@@ -1,4 +1,10 @@
<?php
/* Pi-hole: A black hole for Internet advertisements
* (c) 2017 Pi-hole, LLC (https://pi-hole.net)
* Network-wide ad blocking via your own hardware.
*
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
function testFTL()
{
@@ -101,3 +107,4 @@ function disconnectFTL($quiet=true)
echo "OK.\n\n";
}
}
?>