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

[emmapeel@xxxxxxxxxxxxxx]

commit 7d9e2da7533c684842a6168e8f75d9217e220eaa
Merge: 2cb9b04 9bc5c3c
Author: Antonela <hola@xxxxxxxxxxx>
Date:   Thu Apr 4 08:49:13 2019 +0200

    Merge pull request #15 from torproject/master
    
    rebase

 .gitignore                                         |    2 +
 .htaccess                                          |   22 +-
 assets/scss/_tpo.scss                              |   63 +
 assets/static/bootstrap.css                        | 8664 ++++++++------------
 assets/static/bootstrap.css.map                    |    8 +-
 ...ont-awesome_4-7-0_android_256_0_ffffff_none.png |  Bin 0 -> 2995 bytes
 .../font-awesome_4-7-0_apple_256_0_ffffff_none.png |  Bin 0 -> 2804 bytes
 ...ome_4-7-0_facebook-square_256_0_ffffff_none.png |  Bin 0 -> 2232 bytes
 ...font-awesome_4-7-0_github_256_0_ffffff_none.png |  Bin 0 -> 4270 bytes
 ...t-awesome_4-7-0_instagram_256_0_ffffff_none.png |  Bin 0 -> 5472 bytes
 ...ome_4-7-0_linkedin-square_256_0_ffffff_none.png |  Bin 0 -> 2695 bytes
 .../font-awesome_4-7-0_linux_256_0_ffffff_none.png |  Bin 0 -> 6101 bytes
 ...ont-awesome_4-7-0_windows_256_0_ffffff_none.png |  Bin 0 -> 1674 bytes
 ...iconic_1-1-1_arrow-bottom_256_0_401753_none.png |  Bin 0 -> 1496 bytes
 ...iconic_1-1-1_arrow-bottom_256_0_ffffff_none.png |  Bin 0 -> 1496 bytes
 configs/i18n.ini                                   |    2 +-
 .../about/jobs/backend-engineer-ooni/contents.lr   |    2 +-
 content/about/people/cohosh/contents.lr            |    2 +
 content/about/people/ssteele/contents.lr           |    2 +-
 content/about/people/wayward/contents.lr           |    2 +-
 databags/alternatives.ini                          |    6 +
 templates/download-android.html                    |    2 +-
 templates/footer.html                              |   18 +-
 templates/hero-download.html                       |    4 +-
 templates/hero-home.html                           |    2 +-
 templates/home.html                                |    2 +-
 templates/navbar.html                              |    6 +-
 tpo.lektorproject                                  |   20 -
 28 files changed, 3437 insertions(+), 5392 deletions(-)



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