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

[hiro@xxxxxxxxxxxxxx]

commit 45eff7a528b747fcf7798b692e6475196bcccd71
Merge: 7363ba4 48532f9
Author: emma peel <emma.peel@xxxxxxxxxx>
Date:   Tue Feb 12 11:17:06 2019 +0100

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

 content/about/people/moritz/contents.lr |  2 --
 content/thank-you/contents.lr           | 15 +++++++++++++++
 databags/menu+en.ini                    | 16 ++++++----------
 databags/menu+es.ini                    | 16 ++++++----------
 databags/menu+fr.ini                    | 16 ++++++----------
 databags/menu_footer+en.ini             | 15 +++++++++++++++
 databags/menu_footer+es.ini             | 15 +++++++++++++++
 databags/menu_footer+fr.ini             | 15 +++++++++++++++
 templates/contact.html                  |  6 +++---
 templates/download-languages.html       |  5 +++++
 templates/download-options.html         |  5 +++++
 templates/download.html                 |  4 ++--
 templates/footer.html                   | 17 ++---------------
 templates/hero-download.html            |  2 +-
 templates/home.html                     |  4 ++--
 templates/homepage.html                 |  8 +++++---
 templates/macros/downloads.html         |  6 +++---
 templates/script-download.html          | 14 ++++++++++++++
 templates/thank-you.html                | 24 ++++++++++++++++++++++++
 19 files changed, 144 insertions(+), 61 deletions(-)



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