[tor-commits] [community/staging] Merge branch 'training' into 'master'

[pili@xxxxxxxxxxxxxx]

commit 20e218feec4bbea8552a80224805d59b07f77ce4
Merge: b82693c 6ca83a3
Author: Pili Guerra <pili@xxxxxxxxxxxxxx>
Date:   Mon Jun 3 08:53:04 2019 +0000

    Merge branch 'training' into 'master'
    
    Training
    
    See merge request pili/community!4

 content/training/best-practices/contents.lr  | 57 ++++++++++++++++++++++++++++
 content/training/code-of-conduct/contents.lr | 21 ++++++++++
 content/training/contents.lr                 |  2 +-
 content/training/resources/contents.lr       | 21 ++++++++++
 content/training/trainer-faq/contents.lr     | 21 ++++++++++
 templates/training.html                      | 32 ++++++++++++----
 6 files changed, 145 insertions(+), 9 deletions(-)



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