]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorDmitry Alenichev <mitya@vk.com>
Tue, 29 Jan 2019 15:19:56 +0000 (18:19 +0300)
committerDmitry Alenichev <mitya@vk.com>
Tue, 29 Jan 2019 15:19:56 +0000 (18:19 +0300)
1  2 
pdns/dnsdist-lua-rules.cc

Simple merge