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
make.sh

Simple merge
diff --cc make.sh
Simple merge