]> 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: dd29d56 fff2be2)
Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:15:49 +0000 (23:15 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:15:49 +0000 (23:15 +0100)
Conflicts:
langs/de/cgi-bin/de.pl

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