]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
projects / people / mfischer / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a9ef98 50f75f8)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <matthias.fischer@ipfire.org>
Sat, 16 Jan 2021 15:11:31 +0000 (16:11 +0100)
committerMatthias Fischer <matthias.fischer@ipfire.org>
Sat, 16 Jan 2021 15:11:31 +0000 (16:11 +0100)
1  2 
langs/en/cgi-bin/en.pl patch | diff1 | diff2 | blob | history

diff --cc langs/en/cgi-bin/en.pl
Simple merge
Matthias' tree of IPFire 2.x