[tor-commits] [tpo/staging] Merge branch 'master' of https://git.torproject.org/project/web/tpo

[emmapeel at torproject.org]

commit bcd7da91c73e55d11656320203353a1054aef180
Merge: 3bc5176 b0e53cc
Author: Pili Guerra <pili at piliguerra.com>
Date:   Tue Jul 30 12:11:31 2019 +0100

    Merge branch 'master' of https://git.torproject.org/project/web/tpo

 content/about/people/acat/contents.lr         | 2 +-
 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/catalyst/contents.lr     | 2 +-
 content/about/people/cindy-core/contents.lr   | 2 +-
 content/about/people/cohosh/contents.lr       | 2 +-
 content/about/people/emmapeel/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/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 +-
 templates/macros/people.html                  | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)