Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2018-12-12 09:27:59 +01:00
284 changed files with 26196 additions and 21390 deletions

View File

@@ -125,8 +125,6 @@ var/ipfire/modem-lib.pl
#var/ipfire/modem/settings
var/ipfire/modem-lib.pl
var/ipfire/network-functions.pl
#var/ipfire/nfs
#var/ipfire/nfs/nfs-server
var/ipfire/optionsfw
#var/ipfire/optionsfw/settings
var/ipfire/ovpn