Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Marc Singer 2015-07-24 09:44:50 -07:00
commit 7794fa4f64

View file

@ -464,16 +464,17 @@ ShellInABox.prototype.messageReplay = function(type, data) {
}; };
ShellInABox.prototype.about = function() { ShellInABox.prototype.about = function() {
alert("Shell In A Box version " + VERSION + alert("Shell In A Box " + VERSION +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\n\n" +
"For more information check http://shellinabox.com" + "Copyright 2008-2015 by Markus Gutschke. For more information visit\n" +
"http://shellinabox.com or http://github.com/shellinabox/." +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
"\n\n" + "\n\n" +
"This product includes software developed by the OpenSSL Project\n" + "This product includes software developed by the OpenSSL Project for\n" +
"for use in the OpenSSL Toolkit. (http://www.openssl.org/)\n" + "use in the OpenSSL Toolkit. (http://www.openssl.org/)" +
"\n" + "\n\n" +
"This product includes cryptographic software written by " + "This product includes cryptographic software written by Eric Young\n" +
"Eric Young\n(eay@cryptsoft.com)" : "(eay@cryptsoft.com)" :
"")); ""));
}; };