commit 48d10f20d5b3f099b8448bc9be8439b0d047e130 Merge: f8cefd2 044454c Author: Pili Guerra <pili@torproject.org> Date: Mon Jun 3 08:51:55 2019 +0000 Merge branch 'training' into 'staging' Training See merge request web/community!10 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(-)