[tor-commits] [tpo/staging] Merge pull request #14 from torproject/master

[emmapeel at torproject.org]

commit 2cb9b046901fbf8346223ee2111c3153ca758d17
Merge: 086b430 00cdf0c
Author: Antonela <hola at antonela.me>
Date:   Thu Mar 28 11:48:03 2019 -0300

    Merge pull request #14 from torproject/master
    
    rebase

 .htaccess                                     | 42 +++++++++++++++------------
 content/about/people/agrabeli/contents.lr     |  2 +-
 content/about/people/ahf/contents.lr          |  2 +-
 content/about/people/alsmith/contents.lr      |  2 +-
 content/about/people/antonela/contents.lr     |  2 +-
 content/about/people/atagar/contents.lr       |  2 +-
 content/about/people/bdavila/contents.lr      |  2 +-
 content/about/people/boklm/contents.lr        |  2 +-
 content/about/people/catalyst/contents.lr     |  2 +-
 content/about/people/cindy-core/contents.lr   |  2 +-
 content/about/people/cohosh/contents.lr       | 15 ++++++++++
 content/about/people/emmapeel/contents.lr     |  2 +-
 content/about/people/ewyatt/contents.lr       |  2 +-
 content/about/people/flexlibris/contents.lr   |  2 +-
 content/about/people/gaba/contents.lr         |  2 +-
 content/about/people/iangoldberg/contents.lr  |  2 +-
 content/about/people/intrigeri/contents.lr    |  2 +-
 content/about/people/irl/contents.lr          |  2 +-
 content/about/people/karsten/contents.lr      |  2 +-
 content/about/people/kat/contents.lr          |  2 +-
 content/about/people/kushal/contents.lr       |  2 +-
 content/about/people/ln5/contents.lr          |  2 +-
 content/about/people/mcs/contents.lr          |  2 +-
 content/about/people/nickm/contents.lr        |  2 +-
 content/about/people/pili/contents.lr         |  2 +-
 content/about/people/pospeselr/contents.lr    |  2 +-
 content/about/people/sajolida/contents.lr     |  2 +-
 content/about/people/sisbell/contents.lr      |  2 +-
 content/about/people/sjmurdoch/contents.lr    |  2 +-
 content/about/people/ssteele-core/contents.lr |  2 +-
 content/about/people/sstevenson/contents.lr   |  2 +-
 content/about/people/stephw/contents.lr       |  2 +-
 content/about/people/teor/contents.lr         |  2 +-
 content/about/people/tjr/contents.lr          |  2 +-
 content/about/people/wayward/contents.lr      |  2 +-
 content/about/people/wseltzer/contents.lr     |  2 +-
 databags/versions.ini                         |  2 +-
 templates/download.html                       |  4 ++-
 templates/hero-download.html                  |  4 ++-
 templates/macros/people.html                  |  2 +-
 templates/meta.html                           | 10 +++----
 templates/navbar.html                         |  2 +-
 42 files changed, 86 insertions(+), 63 deletions(-)