commit 530331a95807603311a9dafe6ecbe5a623fd0d8e
Merge: 5b6be9a d4e4a5a
Author: hiro <h...@torproject.org>
Date: Thu Jan 17 16:13:46 2019 +0100
Merge branch 'staging'
configs/i18n.ini | 3 ++-
content/about/history/contents.lr | 25 +++++++++++++++++--------
content/about/people/agrabeli/contents.lr | 3 +--
content/about/people/biella/contents.lr | 13 ++++---------
content/about/people/catalyst/contents.lr | 4 ++--
content/about/people/cindy/contents.lr | 13 +++----------
content/about/people/ewyatt/contents.lr | 3 +--
content/about/people/flexlibris/contents.lr | 5 ++---
content/about/people/gunner/contents.lr | 5 ++---
content/about/people/julius/contents.lr | 13 +++++--------
content/about/people/ln5/contents.lr | 4 ++--
content/about/people/matt-core/contents.lr | 3 +--
content/about/people/matt/contents.lr | 6 ++----
content/about/people/meejah/contents.lr | 4 +---
content/about/people/megan/contents.lr | 15 ++++-----------
content/about/people/micahflee/contents.lr | 5 +----
content/about/people/moritz/contents.lr | 3 +--
content/about/people/mtigas/contents.lr | 4 +---
content/about/people/n8fr8/contents.lr | 5 +++--
content/about/people/nickm/contents.lr | 3 +--
content/about/people/nighat/contents.lr | 16 ++++++----------
content/about/people/nyinz/contents.lr | 3 +--
content/about/people/pari/contents.lr | 3 +--
content/about/people/phoul/contents.lr | 4 ++--
content/about/people/phw/contents.lr | 5 +----
content/about/people/ramy/contents.lr | 24 +++++++-----------------
content/about/people/redshiftzero/contents.lr | 3 +--
content/about/people/sjmurdoch/contents.lr | 5 ++---
content/about/people/syverson/contents.lr | 4 ++--
content/about/people/teor/contents.lr | 3 +--
content/about/people/tjr/contents.lr | 3 +--
content/about/people/wseltzer/contents.lr | 4 ++--
content/download/contents.lr | 1 +
models/page.ini | 3 +++
models/people.ini | 3 +++
models/person.ini | 4 ++++
templates/hero-home.html | 6 +++---
templates/jobs.html | 6 +++---
38 files changed, 100 insertions(+), 139 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
