[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



commit 2cceab0b1cdfda5a8448c2862492da2c90d63f48
Merge: 9a01de7 d2feed9
Author: Antonela <hola@xxxxxxxxxxx>
Date:   Fri Jan 25 15:01:01 2019 -0300

    Merge pull request #3 from torproject/master
    
    rebase

 assets/scss/_portal.scss                           |    2 +-
 assets/scss/_tor-variables.scss                    |    2 +
 assets/scss/_tor.scss                              |    5 +
 assets/scss/_tpo.scss                              |   17 +-
 assets/static/bootstrap.css                        | 8597 ++++++++------------
 assets/static/bootstrap.css.map                    |    8 +-
 assets/static/images/android-logo/png/Shape.png    |  Bin 0 -> 801 bytes
 assets/static/images/android-logo/png/Shape@xxxxxx |  Bin 0 -> 1850 bytes
 assets/static/images/android-logo/svg/Shape.svg    |   11 +
 assets/static/images/apple-logo/png/Shape.png      |  Bin 0 -> 1113 bytes
 assets/static/images/apple-logo/png/Shape@xxxxxx   |  Bin 0 -> 2311 bytes
 assets/static/images/apple-logo/svg/Shape.svg      |   19 +
 assets/static/images/google-play-badge.png         |  Bin 0 -> 13957 bytes
 assets/static/images/linux-logo/png/Shape.png      |  Bin 0 -> 2112 bytes
 assets/static/images/linux-logo/png/Shape@xxxxxx   |  Bin 0 -> 4675 bytes
 assets/static/images/linux-logo/svg/Shape.svg      |   15 +
 .../tor-browser-mobile-window/png/onboarding.png   |  Bin 0 -> 107647 bytes
 .../png/onboarding@xxxxxx                          |  Bin 0 -> 258345 bytes
 .../tor-browser-mobile-window/svg/onboarding.svg   |   22 +
 assets/static/images/windows-logo/png/Shape.png    |  Bin 0 -> 339 bytes
 assets/static/images/windows-logo/png/Shape@xxxxxx |  Bin 0 -> 633 bytes
 assets/static/images/windows-logo/svg/Shape.svg    |   18 +
 .../jobs/developer-data-architect/contents.lr      |   57 +-
 .../jobs/senior-system-administrator/contents.lr   |   77 +-
 content/about/people/agrabeli/contents.lr          |    1 -
 content/about/people/arma/contents.lr              |    3 +-
 content/about/people/cindy-core/contents.lr        |    3 +-
 content/about/people/dawuud/contents.lr            |    4 +-
 content/about/people/hc/contents.lr                |    3 +-
 content/about/people/hellais/contents.lr           |    4 +-
 content/about/people/iangoldberg/contents.lr       |    3 +-
 content/about/people/inf0/contents.lr              |    3 +-
 content/about/people/irl/contents.lr               |    3 +-
 content/about/people/karsten/contents.lr           |    3 +-
 content/about/people/kushal/contents.lr            |    5 +-
 content/about/people/mrphs/contents.lr             |    3 +-
 content/about/people/robgjansen/contents.lr        |    4 +-
 content/about/people/saint/contents.lr             |    4 +-
 content/about/people/sebastian/contents.lr         |    5 +-
 content/about/people/sukhe/contents.lr             |    6 +-
 .../about/reports/2007-irs-form-990/contents.lr    |   11 +
 .../reports/2008-financial-statements/contents.lr  |   11 +
 .../about/reports/2008-irs-form-990/contents.lr    |   11 +
 .../about/reports/2009-annual-report/contents.lr   |   11 +
 .../about/reports/2009-data-collection/contents.lr |   11 +
 .../reports/2009-financial-statements/contents.lr  |   11 +
 .../about/reports/2009-irs-form-990/contents.lr    |   11 +
 .../about/reports/2010-irs-form-990/contents.lr    |   11 +
 .../about/reports/2011-data-collection/contents.lr |   11 +
 .../reports/2011-financial-statements/contents.lr  |   11 +
 content/about/reports/2011-form-pc/contents.lr     |   11 +
 .../about/reports/2011-irs-form-990/contents.lr    |   11 +
 .../about/reports/2012-annual-report/contents.lr   |   11 +
 .../reports/2012-financial-statements/contents.lr  |   11 +
 content/about/reports/2012-form-pc/contents.lr     |   11 +
 .../about/reports/2012-irs-form-990/contents.lr    |   11 +
 .../reports/2013-financial-statements/contents.lr  |   11 +
 content/about/reports/2013-form-pc/contents.lr     |   11 +
 .../about/reports/2013-irs-form-990/contents.lr    |   11 +
 .../about/reports/2014-irs-form-990/contents.lr    |   13 +
 .../about/reports/2015-irs-form-990/contents.lr    |   13 +
 .../2016-12-05-tor-project-bylaws/contents.lr      |   11 +
 .../about/reports/2016-irs-form-990/contents.lr    |   13 +
 .../about/reports/2017-irs-form-990/contents.lr    |   11 +
 .../articles-of-organization-as-filed/contents.lr  |    9 +
 .../reports/articles-of-organization/contents.lr   |    9 +
 .../certificate-legal-existence/contents.lr        |    9 +
 .../about/reports/conflict-of-interest/contents.lr |    9 +
 .../about/reports/form-1023-exhibit-A/contents.lr  |    9 +
 content/about/reports/form-1023/contents.lr        |    9 +
 .../reports/irs-determination-letter/contents.lr   |    9 +
 content/about/sponsors/DARPA-nrl/contents.lr       |   10 +-
 content/about/sponsors/DARPA-penn/contents.lr      |    8 +-
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |    5 +-
 content/about/sponsors/USSD-DHRL/contents.lr       |    5 +-
 content/about/sponsors/individuals/contents.lr     |    3 +-
 content/about/sponsors/mdf/contents.lr             |    2 +-
 content/about/sponsors/mozilla/contents.lr         |    3 +-
 content/about/sponsors/otf/contents.lr             |    3 +-
 content/about/sponsors/sida/contents.lr            |    3 +-
 content/contents.lr                                |    5 +-
 content/download/languages/contents.lr             |   11 +
 content/download/options/contents.lr               |   11 +
 databags/platforms+en.ini                          |   18 +-
 databags/tags.ini                                  |   11 +
 databags/versions.ini                              |   17 +
 i18n/contents.pot                                  |   63 -
 models/people.ini                                  |    1 -
 models/report.ini                                  |   32 +
 models/reports.ini                                 |   28 +
 models/sponsor.ini                                 |    2 +
 templates/download-android.html                    |   27 +
 templates/download-languages.html                  |   39 +
 templates/download-options.html                    |   39 +
 templates/download.html                            |   14 +-
 templates/footer.html                              |    3 +
 templates/header.html                              |    4 +-
 templates/hero-download-languages.html             |    6 +
 templates/hero-download-options.html               |    6 +
 templates/hero-download.html                       |   54 +-
 templates/home.html                                |   20 +-
 templates/macros/downloads.html                    |   36 +
 templates/macros/people.html                       |    5 +-
 templates/macros/reports.html                      |   21 +
 templates/macros/sponsors.html                     |    2 +-
 templates/pagenav.html                             |    4 +-
 templates/report.html                              |    1 +
 templates/reports.html                             |   63 +-
 108 files changed, 4188 insertions(+), 5637 deletions(-)



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