]> 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: cb8a6bf a4fd232)
Merge branch 'openssl-11' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Feb 2018 12:21:10 +0000 (12:21 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Feb 2018 12:21:10 +0000 (12:21 +0000)
1  2 
html/cgi-bin/ovpnmain.cgi patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge
diff --cc make.sh
Simple merge
Peter's tree of IPFire 2.x