[tor-commits] [community/master] Add code of conduct from remote repository

[hiro@xxxxxxxxxxxxxx]

commit fb39e68719548fb7a3345a85958e969988152478
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Thu Sep 5 15:59:17 2019 +0200

    Add code of conduct from remote repository
---
 content/training/code-of-conduct/contents.lr | 2 +-
 lego                                         | 2 +-
 templates/two-columns-page.html              | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/content/training/code-of-conduct/contents.lr b/content/training/code-of-conduct/contents.lr
index 0f3eab0..6d39f0d 100644
--- a/content/training/code-of-conduct/contents.lr
+++ b/content/training/code-of-conduct/contents.lr
@@ -20,6 +20,6 @@ html: two-columns-page.html
 ---
 body:
 
-##Code of Conduct for Trainers
+## Code of Conduct for Trainers
 
 The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate. You can find our code of conduct [here](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt)
diff --git a/lego b/lego
index 62b25f1..4911d14 160000
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 62b25f1cba4a7af931ccd8f4420d0669812db09c
+Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index 4ccb30e..199a452 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -14,6 +14,11 @@
         </div>
     {% endfor %}
     </div>
+
+    {% if this.path == "/training/code-of-conduct" %}
+      {{ render_text("https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt";)|safe }}
+    {% endif %}
+
     <div class="card mt-5">
       <ul class="list-group list-group-flush">
         <!--li class="list-group-item"><a><span class="card-text text-muted">{{ _("Contributors to this page:") }} <a href="#" title="#">cypherpunk</a></span></li-->
@@ -23,4 +28,4 @@
       </ul>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits