DL6ER f88092175e Conflicts: ...

api.php
	scripts/pi-hole/php/FTL.php
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php

2017-02-19 14:17:52 +01:00

..

footer.js

Conflicts:

2017-02-19 14:17:52 +01:00

gravity.js

Added header to scripts/pi-hole/js files

2017-02-14 15:01:40 +01:00

header.js

Added header to scripts/pi-hole/js files

2017-02-14 15:01:40 +01:00

index.js

Squashed commit of the following:

2017-02-16 08:52:30 +01:00

list.js

Added header to scripts/pi-hole/js files

2017-02-14 15:01:40 +01:00

queries.js

Squashed commit of the following:

2017-02-16 08:52:30 +01:00

queryads.js

Added header to scripts/pi-hole/js files

2017-02-14 15:01:40 +01:00

settings.js

Added header to scripts/pi-hole/js files

2017-02-14 15:01:40 +01:00

taillog.js

Squashed commit of the following:

2017-02-16 08:52:30 +01:00