Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 8 Feb 2019 08:59:31 +0000 (09:59 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 8 Feb 2019 08:59:31 +0000 (09:59 +0100)
commitc1c754a1211fbe50b7ba5b7a25444bd34b090957
tree5406e461d878b5f08b5e6053c67d4b5ce7693939
parentf3cbcfeff9e8ce263c812a25a24c7f4f14d4a64f
parent02a8a241bb74f9ab56d673bc89f3b720fe9c7e12
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
make.sh
src/initscripts/system/firewall