docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1267 from pi-hole/master 

Sync master back into development
This commit is contained in:
Adam Warner 2023-01-03 19:46:50 +00:00 committed by GitHub
parent 7eab50ce29 203f6f4ea3
commit 67d00f3b38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/merge-conflict.yml vendored
View File

@ -18,4 +18,4 @@ jobs:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
commentOnClean: "Conflicts have been resolved."