]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 326a764 2b6c5f2)
Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...
authorAlf Høgemark <alf@i100.no>
Sat, 15 Mar 2014 07:47:56 +0000 (08:47 +0100)
committerAlf Høgemark <alf@i100.no>
Sat, 15 Mar 2014 07:47:56 +0000 (08:47 +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
Peter's tree of IPFire 2.x