Commit f71afd1e authored by Daniel Salzman's avatar Daniel Salzman

Merge branch 'knot-resolver-conflict' into 'master'

distro/rpm: add conflict with knot-resolver < 3.0.0

See merge request !921
parents 74c479c8 9295a7dc