Merge branch 'master' into 0.10

pull/1686/head
sebres 2017-01-23 09:27:40 +01:00
commit 96d404f0fb
2 changed files with 1 additions and 2 deletions

View File

@ -1 +0,0 @@
../../../../config/filter.d/common.conf

View File

@ -8,7 +8,7 @@
# Read common prefixes. If any customizations available -- read them from
# common.local. common.conf is a symlink to the original common.conf and
# should be copied (dereferenced) during installation
before = common.conf
before = ../../../../config/filter.d/common.conf
[Definition]