]> 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: 0ba66e9 90c2ce0)
Merge remote-tracking branch 'amarx/beta3' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:54:06 +0000 (14:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Mar 2014 13:54:06 +0000 (14:54 +0100)
1  2 
html/cgi-bin/firewall.cgi patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/firewall.cgi
Simple merge
Timo's tree of IPFire 2.x