[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  98dd590bb12c298a62e39a175b2b66511c3fb9bd (commit)
      from  3a08552ec30c8cb318ad32afd219c41c1314038d (commit)


- Log -----------------------------------------------------------------
commit 98dd590bb12c298a62e39a175b2b66511c3fb9bd
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Oct 28 14:17:16 2015 -0400

    Add code of conduct reference.

-----------------------------------------------------------------------

Summary of changes:
 community/index.html  | 4 +++-
 community/sidebar.inc | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/community/index.html b/community/index.html
index 498cfb9..5202e92 100644
--- a/community/index.html
+++ b/community/index.html
@@ -13,7 +13,9 @@
 	  <div class="entry-content">
 	    <p>
 	    OpenSSL is a a collaborative effort of a worldwide community of
-	    volunteers. Here are some of the ways you can join the
+            volunteers that has a <a href="conduct.html">code of conduct</a>.
+            </p>
+            <p>Here are some of the ways you can join the
 	    community and contribute.
 	    The list of <a href="team.html">development team members</a> is
 	    available, as is a description of how to
diff --git a/community/sidebar.inc b/community/sidebar.inc
index f975066..0990933 100644
--- a/community/sidebar.inc
+++ b/community/sidebar.inc
@@ -4,6 +4,9 @@
     <h1><a href=".">Community</a></h1>
     <ul>
       <li>
+	  <a href="conduct.html">Code of Conduct</a>
+      </li>
+      <li>
 	  <a href="team.html">Team</a>
       </li>
       <li>