pi-hole / FTL

The Pi-hole FTL engine

https://pi-hole.net

Other

1.34k stars 187 forks source link

Sync v5 -> v6 #1882

Closed DL6ER closed 4 months ago

DL6ER commented 4 months ago

What does this implement/fix?

Merge current development into development-v6 and resolve the arising merge conflict.

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A

By submitting this pull request, I confirm the following:

I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
I have commented my proposed changes within the code.
I am willing to help maintain this change if there are issues with it later.
It is compatible with the EUPL 1.2 license
I have squashed any insignificant commits. (git rebase)

Checklist:

[x] The code change is tested and works locally.
[x] I based my code and PRs against the repositories developmental branch.
[x] I signed off all commits. Pi-hole enforces the DCO for all contributions
[x] I signed all my commits. Pi-hole requires signatures to verify authorship
[x] I have read the above and my PR is ready for review.

DL6ER commented 4 months ago

Note: This is the last time we do this merge due to the way we fixed dnsmasq in development (now master), we'd loose dnsmasq commit information otherwise