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

[hiro@xxxxxxxxxxxxxx]

commit c7295dd3bbb10e8f3d655cbb3e6180fbb5ab6402
Merge: cd42e3b 782582f
Author: Antonela <hola@xxxxxxxxxxx>
Date:   Wed Feb 20 18:36:21 2019 +0100

    Merge pull request #7 from torproject/master
    
    rebase

 assets/scss/_tpo.scss                              |    3 +
 assets/static/bootstrap.css                        | 8611 ++++++++------------
 assets/static/bootstrap.css.map                    |    8 +-
 .../about/jobs/backend-engineer-ooni/contents.lr   |    2 +-
 content/about/jobs/browser-developer/contents.lr   |    2 +-
 content/about/people/iangoldberg/contents.lr       |    2 +-
 content/about/people/moritz/contents.lr            |    4 -
 content/about/people/peter/contents.lr             |    2 +-
 content/about/people/qbi/contents.lr               |    2 +-
 content/about/people/ssteele/contents.lr           |    4 +-
 content/about/people/sukhe/contents.lr             |    3 +-
 content/projects/contents.lr                       |    5 +
 .../torbrowser/RecommendedTBBVersions/contents.lr  |   16 +
 content/projects/torbrowser/contents.lr            |    5 +
 databags/menu_footer+en.ini                        |   15 +
 databags/menu_footer+es.ini                        |   15 +
 databags/menu_footer+fr.ini                        |   15 +
 databags/platforms+es.ini                          |   19 -
 databags/platforms+fr.ini                          |   19 -
 databags/{platforms+en.ini => platforms.ini}       |    4 -
 databags/versions.ini                              |   12 +-
 models/text.ini                                    |    7 +
 templates/about.html                               |    2 +-
 templates/contact.html                             |    5 +-
 templates/download-android.html                    |    6 +-
 templates/download.html                            |    4 +-
 templates/empty.html                               |    7 +-
 templates/footer.html                              |   13 +-
 templates/hero-download.html                       |   15 +-
 templates/macros/contact.html                      |    3 +
 templates/macros/downloads.html                    |   12 +
 templates/macros/footer.html                       |    3 +
 templates/thank-you.html                           |    8 +-
 33 files changed, 3430 insertions(+), 5423 deletions(-)



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