]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9a0562 daf400f)
Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 29 Oct 2013 15:23:35 +0000 (16:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 29 Oct 2013 15:23:35 +0000 (16:23 +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
Timo's tree of IPFire 2.x