Skip to content
Commit 946b2f72 authored by Recolic Keghart's avatar Recolic Keghart
Browse files

Merge branch 'master' into 'master' 

allow dns upstream

See merge request !1
parents 322e72d3 6c7f800d
Hide whitespace changes
Inline Side-by-side
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