]> git.ipfire.org Git - people/arne_f/ipfire-2.x.git/commitdiff
projects / people / arne_f / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 016e63e 765423c)
Merge remote-tracking branch 'mfischer/python' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:30:27 +0000 (14:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:30:27 +0000 (14:30 +0200)
1  2 
langs/de/cgi-bin/de.pl patch | diff1 | diff2 | blob | history

diff --cc langs/de/cgi-bin/de.pl
Simple merge
Arne's tree of IPFire 2.x.