Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 28 Dec 2018 06:36:59 +0000 (07:36 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 28 Dec 2018 06:36:59 +0000 (07:36 +0100)
1  2 
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

Simple merge
Simple merge