pi-hole / FTL

The Pi-hole FTL engine
https://pi-hole.net
Other
1.34k stars 187 forks source link

Merge latest v5 development into v6 #1953

Closed DL6ER closed 1 month ago

DL6ER commented 1 month ago

What does this implement/fix?

Merge development -> development-v6 in preparation for a later development-v6 -> development -> master release chain of merges. Merging this PR should remove all existing merge conflicts on #1950

No functional changes. To me more precise: no changes at all except git bookkeeping


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:

  1. 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.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist: