[tor-commits] [tpo/staging] Merge pull request #10 from torproject/master

[emmapeel@xxxxxxxxxxxxxx]

commit 286bef97565f00093c0c49b303305440ce30f708
Merge: b2470a7 170caca
Author: Antonela <hola@xxxxxxxxxxx>
Date:   Mon Mar 25 13:35:26 2019 -0300

    Merge pull request #10 from torproject/master
    
    rebase

 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(-)



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