]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9613df 9817af5)
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 patch | diff1 | diff2 | blob | history

diff --cc pdns/dnsdist-lua-rules.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.