[tor-commits] [community/staging] Merge commit '9825e82b467b2ccf98c5a666b641a68014b0faf2'

[emmapeel at torproject.org]

commit 2dec44b28758149f3b199173e05ac8c74bbebd68
Merge: aa62941 9825e82
Author: hiro <hiro at torproject.org>
Date:   Mon May 27 14:52:36 2019 +0200

    Merge commit '9825e82b467b2ccf98c5a666b641a68014b0faf2'

 assets/scss/_tor.scss                          |     2 -
 assets/static/images/home/png/localization.png |   Bin 0 -> 62740 bytes
 content/localization/contents+en.lr            |     4 +-
 content/localization/contents+es.lr            |     4 +-
 content/localization/contents+fr.lr            |     4 +-
 content/localization/contents.lr               |     4 +-
 content/onion-services/contents+en.lr          |     2 +
 content/onion-services/contents+es.lr          |     2 +
 content/onion-services/contents+fr.lr          |     2 +
 content/onion-services/contents.lr             |     2 +
 content/outreach/contents+en.lr                |     4 +-
 content/outreach/contents+es.lr                |     4 +-
 content/outreach/contents+fr.lr                |     4 +-
 content/outreach/contents.lr                   |     4 +-
 content/relay-operations/contents+en.lr        |     2 +
 content/relay-operations/contents+es.lr        |     2 +
 content/relay-operations/contents+fr.lr        |     2 +
 content/relay-operations/contents.lr           |     2 +
 content/training/contents+en.lr                |     2 +
 content/training/contents+es.lr                |     2 +
 content/training/contents+fr.lr                |     2 +
 content/training/contents.lr                   |     2 +
 content/user-testing/contents+en.lr            |     4 +-
 content/user-testing/contents+es.lr            |     4 +-
 content/user-testing/contents+fr.lr            |     4 +-
 content/user-testing/contents.lr               |     4 +-
 models/page.ini                                |     5 +
 static/css/bootstrap-grid.css                  |  4053 +++++++++
 static/css/bootstrap-grid.css.map              |     1 +
 static/css/bootstrap-reboot.css                |   327 +
 static/css/bootstrap-reboot.css.map            |     1 +
 static/css/bootstrap.css                       | 10845 +++++++++++++++++++++++
 static/css/bootstrap.css.map                   |     1 +
 templates/home.html                            |     9 +-
 34 files changed, 15299 insertions(+), 17 deletions(-)