[tor-commits] [tpo/master] Merge remote-tracking branch 'origin/staging' into staging

[hiro at torproject.org]

commit ec7b83c8f0f726111d8875595c8e4f2c77cccecc
Merge: 93d402e 70a1687
Author: emma peel <emma.peel at riseup.net>
Date:   Fri Jan 11 15:01:47 2019 +0100

    Merge remote-tracking branch 'origin/staging' into staging

 content/about/contents+en.lr          |   13 -
 content/about/contents+es.lr          |   13 -
 content/about/contents+fr.lr          |   13 -
 content/about/history/contents+en.lr  |   31 -
 content/about/history/contents+es.lr  |   31 -
 content/about/history/contents+fr.lr  |   31 -
 content/about/jobs/contents+en.lr     |   13 -
 content/about/jobs/contents+es.lr     |   13 -
 content/about/jobs/contents+fr.lr     |   13 -
 content/about/people/contents+en.lr   |   15 -
 content/about/people/contents+es.lr   |   15 -
 content/about/people/contents+fr.lr   |   15 -
 content/about/reports/contents+en.lr  |   13 -
 content/about/reports/contents+es.lr  |   13 -
 content/about/reports/contents+fr.lr  |   13 -
 content/about/sponsors/contents+en.lr |   13 -
 content/about/sponsors/contents+es.lr |   13 -
 content/about/sponsors/contents+fr.lr |   13 -
 content/contact/contents+en.lr        |   15 -
 content/contact/contents+es.lr        |   15 -
 content/contact/contents+fr.lr        |   15 -
 content/contents+en.lr                |   16 -
 content/contents+es.lr                |   16 -
 content/contents+fr.lr                |   16 -
 content/download/contents+en.lr       |   11 -
 content/download/contents+es.lr       |   11 -
 content/download/contents+fr.lr       |   11 -
 content/press/contents+en.lr          |   13 -
 content/press/contents+es.lr          |   13 -
 content/press/contents+fr.lr          |   13 -
 i18n/contents+en.po                   |   79 --
 i18n/contents+es.po                   | 1895 ---------------------------------
 i18n/contents+fr.po                   |  426 --------
 33 files changed, 2859 deletions(-)