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

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2020-11-13 18:20:59 +00:00
7 changed files with 22 additions and 3 deletions

View File

@@ -17,6 +17,7 @@ etc/sysconfig/firewall.local
etc/sysconfig/rc.local
etc/udev/rules.d/30-persistent-network.rules
srv/web/ipfire/html/proxy.pac
usr/share/xt_geoip
var/ipfire/dma
var/ipfire/time
var/ipfire/firewall/locationblock
@@ -25,6 +26,7 @@ var/ipfire/ovpn
var/ipfire/urlfilter/blacklist
var/ipfire/urlfilter/settings
var/lib/alternatives
var/lib/location/database.db
var/log/cache
var/log/dhcpcd.log
var/log/messages

View File

@@ -0,0 +1 @@
../../../common/libloc