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

[hiro@xxxxxxxxxxxxxx]

commit b081b7e45bd1a08d1c4c00c55aa0a802e1d003d2
Merge: e5b5483 b318b4f
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Mon Jan 21 15:22:50 2019 +0100

    Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging

 .../jobs/developer-data-architect/contents.lr      | 57 ++++++++--------
 .../jobs/senior-system-administrator/contents.lr   | 77 +++++++++++++---------
 content/about/people/arma/contents.lr              |  3 +-
 content/about/people/cindy-core/contents.lr        |  3 +-
 content/about/people/dawuud/contents.lr            |  4 +-
 content/about/people/hc/contents.lr                |  3 +-
 content/about/people/hellais/contents.lr           |  4 +-
 content/about/people/iangoldberg/contents.lr       |  3 +-
 content/about/people/inf0/contents.lr              |  3 +-
 content/about/people/irl/contents.lr               |  3 +-
 content/about/people/karsten/contents.lr           |  3 +-
 content/about/people/kushal/contents.lr            |  5 +-
 content/about/people/mrphs/contents.lr             |  3 +-
 content/about/people/robgjansen/contents.lr        |  4 +-
 content/about/people/saint/contents.lr             |  4 +-
 content/about/people/sebastian/contents.lr         |  5 +-
 content/about/people/sukhe/contents.lr             |  6 +-
 content/about/sponsors/DARPA-nrl/contents.lr       | 10 +--
 content/about/sponsors/DARPA-penn/contents.lr      |  8 +--
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |  5 +-
 content/about/sponsors/USSD-DHRL/contents.lr       |  5 +-
 content/about/sponsors/individuals/contents.lr     |  3 +-
 content/about/sponsors/mdf/contents.lr             |  2 +-
 content/about/sponsors/mozilla/contents.lr         |  3 +-
 content/about/sponsors/otf/contents.lr             |  3 +-
 content/about/sponsors/sida/contents.lr            |  3 +-
 content/contents.lr                                |  5 +-
 models/people.ini                                  |  1 -
 models/sponsor.ini                                 |  2 +
 templates/download.html                            | 14 ++--
 templates/home.html                                | 20 +++---
 31 files changed, 133 insertions(+), 141 deletions(-)



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