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

This commit is contained in:
Stefan Schantl
2015-04-21 19:20:26 +02:00
6 changed files with 15 additions and 24 deletions

View File

@@ -2,6 +2,7 @@ etc/system-release
etc/issue
etc/rc.d/init.d/firewall
etc/rc.d/init.d/network-trigger
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/rcsysinit.d/S90network-trigger
srv/web/ipfire/cgi-bin/firewall.cgi

View File

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