[FFmpeg-cvslog] [ffmpeg-web] branch master updated. c8aaaea web/contact: Point to the Code of conduct

[ffmpeg-cvslog at ffmpeg.org]

The branch, master has been updated
       via  c8aaaea25c6b81e31e5d2e200cb244dd946ef657 (commit)
      from  ea7e07d02d89fddf673022b837d9813277023ae1 (commit)


- Log -----------------------------------------------------------------
commit c8aaaea25c6b81e31e5d2e200cb244dd946ef657
Author:     Michael Niedermayer <michael at niedermayer.cc>
AuthorDate: Mon Jun 6 23:48:58 2016 +0200
Commit:     Michael Niedermayer <michael at niedermayer.cc>
CommitDate: Tue Jun 7 00:43:24 2016 +0200

    web/contact: Point to the Code of conduct
    
    Suggested-by: Felt, Patrick
    Reviewed-by: Lou Logan <lou at lrcd.com>
    Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

diff --git a/src/contact b/src/contact
index 200cb67..e076222 100644
--- a/src/contact
+++ b/src/contact
@@ -11,7 +11,7 @@
           avoid <a href="https://en.wikipedia.org/wiki/Top-posting">top-posting</a> and
           thread hijacking (that is, replying to a thread and changing the subject line to
           something completely unrelated that was not being discussed within the original
-          thread).
+          thread) and please read the <a href="developer.html#Code-of-conduct">Code of conduct</a>.
         </p>
         <p>
           Configuring your mail client to break lines after 70 or so characters is a plus.
@@ -104,6 +104,7 @@
           have voice in the channels.
           <a href="https://webchat.freenode.net/">freenode webchat</a> is a web
           client for these channels.
+          Please read and follow the <a href="developer.html#Code-of-conduct">Code of conduct</a>.
         </p>
       </div>
       <div class="list-group">

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

Summary of changes:
 src/contact | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
--