Merge pull request #12740 from zhanhb/conffiles
authorRosen Penev <rosenp@gmail.com>
Tue, 7 Jul 2020 22:03:54 +0000 (15:03 -0700)
committerGitHub <noreply@github.com>
Tue, 7 Jul 2020 22:03:54 +0000 (15:03 -0700)
treewide: add and fix conffiles


Trivial merge