Commit 57f0949e authored by Evan Hunt's avatar Evan Hunt
Browse files

Merge branch 'placeholder' into 'master'


See merge request !339
parents 3b66a7bb 94567f96
Pipeline #2152 canceled with stages
in 5 minutes and 17 seconds
4960. [placeholder]
4959. [func] NSID logging (enabled by the "request-nsid" option)
now has its own "nsid" category, instead of using the
"resolver" category. [GL !332]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment