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)
commit7b6f8596edd5591a1bde21b34a7665170e5d4353
treeb3421b02479caaf1299f775ff3df223305afd1b2
parented809cf07a5ccacc5817f682fc9103a2f52163d6
parentf1f40274a095f0c5173a69767d9efa647e9f1a8a
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl