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:
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
This commit is contained in:
DL6ER
2017-02-19 14:20:56 +01:00
parent f88092175e 80ad3bac4d
commit 86bfa663f9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api.php
View File

@@ -1,3 +1,9 @@
<!-- 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. -->
<?php
/* Pi-hole: A black hole for Internet advertisements
* (c) 2017 Pi-hole, LLC (https://pi-hole.net)