]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa7f2e2 508547f)
Merge branch 'perl-system' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 17 Jun 2021 20:11:47 +0000 (20:11 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 17 Jun 2021 20:11:47 +0000 (20:11 +0000)
1  2 
html/cgi-bin/proxy.cgi patch | diff1 | diff2 | blob | history
html/cgi-bin/vpnmain.cgi patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/proxy.cgi
Simple merge
diff --cc html/cgi-bin/vpnmain.cgi
Simple merge
IPFire 2.x development tree