]> 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: bd4db47 491957a)
Merge remote-tracking branch 'alfh/feature_langfixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Feb 2014 15:28:23 +0000 (16:28 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Feb 2014 15:28:23 +0000 (16:28 +0100)
1  2 
html/cgi-bin/logs.cgi/firewalllog.dat patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/logs.cgi/firewalllog.dat
Simple merge
IPFire 2.x development tree