commit 170cacac58f7bf6afefcd6dc721c76146b2bf504 Merge: b2470a7 d71e156 Author: hiro hiro@torproject.org Date: Mon Mar 25 15:53:21 2019 +0100

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

content/about/sponsors/bbg/contents.lr | 2 +- content/about/sponsors/hrw/contents.lr | 2 +- content/about/sponsors/nrl/contents.lr | 2 +- databags/download-alternatives.ini | 64 +++++++++++++++++++++++++++++++--- databags/menu+bn-BD.ini | 20 ++++++++++- databags/menu+de.ini | 20 ++++++++++- databags/menu+es.ini | 20 ++++++++++- databags/menu+fr.ini | 20 ++++++++++- databags/menu+id.ini | 20 ++++++++++- databags/menu+it.ini | 20 ++++++++++- databags/menu+pt-BR.ini | 20 ++++++++++- databags/menu+ru.ini | 20 ++++++++++- databags/menu+tr.ini | 20 ++++++++++- databags/menu+zh-CN.ini | 20 ++++++++++- templates/layout.html | 2 ++ templates/navbar.html | 2 +- templates/pagenav.html | 2 +- templates/sponsors.html | 2 +- 18 files changed, 258 insertions(+), 20 deletions(-)