Merge branch 'branches/rudder/3.0' into branches/rudder/3.1

Normation · May 16, 2016 · 2333c4f · 2333c4f
2 parents 39a5625 + ad844f6
commit 2333c4f
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/ncf/debian/conffiles b/ncf/debian/conffiles
@@ -1 +0,0 @@
-/usr/share/ncf/tree/ncf.conf