Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pi-Hole Admin Page v2.5.2 #440

Merged
merged 4 commits into from
Mar 14, 2017
Merged

Pi-Hole Admin Page v2.5.2 #440

merged 4 commits into from
Mar 14, 2017

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Mar 10, 2017

Backport pull requests from devel into master:

AzureMarker and others added 4 commits March 10, 2017 14:42
@AzureMarker @DL6ER
Merge pull request #432 from pi-hole/tweak/teleporter
f7420d2 
Some tweaks for the Pi-hole Teleporter
@DL6ER
Merge pull request #434 from pi-hole/fix/SettingsFallbackDNSlistening
832c7f0 
Fix fallback for default listening behavior
@DL6ER
Merge pull request #435 from pi-hole/tweak/canWhiteWild
898b458 
Can now whitelist wildcard domains.
@DL6ER
Merge pull request #439 from pi-hole/fix/queryads
8a4861c 
Allow block page to access queryads
@DL6ER DL6ER added the Release label Mar 10, 2017
@DL6ER DL6ER changed the title [WIP] Pi-Hole Admin Page v2.5.2 Pi-Hole Admin Page v2.5.2 Mar 10, 2017
@PromoFaux
Copy link
Member

PromoFaux commented Mar 12, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

3 similar comments
@AzureMarker
Copy link
Contributor

AzureMarker commented Mar 13, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@jacobsalmela
Copy link
Contributor

jacobsalmela commented Mar 13, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@dschaper
Copy link
Member

dschaper commented Mar 13, 2017 •
edited
Loading

Approved

Approved with PullApprove

@DL6ER DL6ER merged commit ca8f440 into master Mar 14, 2017
@DL6ER DL6ER deleted the AdminLTE-backports branch March 14, 2017 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DL6ER @PromoFaux @AzureMarker @jacobsalmela @dschaper