[tor-commits] [webwml/staging] this would be #69 in github

[emmapeel@xxxxxxxxxxxxxx]

commit 5137ee72c0d46468f99c57b18196d3e9ee29bd5a
Merge: 2148922d dbd57010
Author: emma peel <emma.peel@xxxxxxxxxx>
Date:   Tue Jan 15 16:20:27 2019 +0000

    this would be #69 in github
    Merge remote-tracking branch 'traumschule/press' into HEAD

 .htaccess                                          |    2 +-
 Makefile                                           |    4 +-
 about/en/board.wml                                 |   24 +-
 about/en/contact.wml                               |    4 +-
 about/en/corepeople.wml                            |   80 +-
 about/en/financials.wml                            |    5 +-
 about/en/jobs-metrics-data-architect.wml           |    6 +-
 about/en/jobs.wml                                  |   12 +-
 about/en/sponsors.wml                              |   16 +-
 ...6-TorProject-combined-Form990_Audit_Results.pdf |  Bin 0 -> 1140865 bytes
 ...rProject-combined-Form990_Audit_Results.pdf.asc |   17 +
 about/findoc/2017-TorProject-Form990.pdf           |  Bin 0 -> 306001 bytes
 about/findoc/2017-TorProject-Form990.pdf.asc       |   16 +
 css/layout.css                                     |   37 +-
 css/layout.min.css                                 |   37 +-
 css/tbbproject.css                                 |    2 +-
 css/tbbproject.min.css                             |    2 +-
 donate/en/donate-options.wml                       |    4 +-
 donate/en/donate.wml                               |    2 +-
 donate/en/donor-faq.wml                            |  457 +----
 donate/en/donor-privacy-policy.wml                 |   30 +-
 download/en/download-easy.wml                      |   11 +-
 download/en/download.wml                           |    8 +-
 en/banner.wmi                                      |    2 +
 en/banner2.wmi                                     |    4 +-
 en/index.wml                                       |   43 +-
 es/banner.wmi                                      |    2 +
 es/banner2.wmi                                     |    4 +-
 es/index.wml                                       |   43 +-
 images/people/alsmith.png                          |  Bin 0 -> 42933 bytes
 images/people/hc.png                               |  Bin 0 -> 38444 bytes
 images/people/orig/alsmith.jpg                     |  Bin 0 -> 267849 bytes
 images/people/orig/hc.jpg                          |  Bin 0 -> 149652 bytes
 include/head-index.wmi                             |  116 ++
 include/keys.txt                                   |    6 +-
 include/keys.wmi                                   |   32 +-
 include/versions.wmi                               |   20 +-
 keys/alsmith.txt                                   |   50 +
 press/en/press.wml                                 | 1818 ++++++++++++--------
 press/press.pl                                     |   67 +-
 projects/en/torbrowser.wml                         |  150 +-
 projects/torbrowser/RecommendedTBBVersions         |   16 +-
 42 files changed, 1766 insertions(+), 1383 deletions(-)

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