]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed809cf f1f4027)
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 patch | diff1 | diff2 | blob | history
langs/en/cgi-bin/en.pl patch | diff1 | diff2 | blob | history

diff --cc langs/de/cgi-bin/de.pl
Simple merge
diff --cc langs/en/cgi-bin/en.pl
Simple merge
IPFire 2.x development tree