Merge remote-tracking branch 'origin/next' into fifteen

[ipfire-2.x.git] / config / rootfiles / common / configroot

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 087443aab70c1c734b8e1a9000e129bbdfbd32a2..b1097cd8956e2af376ba1b8081263308de3f5873 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -155,6 +155,7 @@ var/ipfire/proxy
 #var/ipfire/proxy/calamaris
 #var/ipfire/proxy/calamaris/bin
 #var/ipfire/proxy/settings
+#var/ipfire/proxy/squid.conf
 var/ipfire/qos
 #var/ipfire/qos/bin
 #var/ipfire/qos/bin/RRD-func.pl