commit 51fb6b67dfccc415f792d36d871a99a57e1dba79 Merge: cd93b7d a08efbf Author: Antonela <hola@antonela.me> Date: Sat Feb 9 18:02:27 2019 +0200 Merge pull request #5 from torproject/master rebase content/about/contents.lr | 2 ++ content/about/history/contents.lr | 2 ++ .../about/jobs/backend-engineer-ooni/contents.lr | 4 +++ content/about/jobs/browser-developer/contents.lr | 4 +++ content/about/jobs/contents.lr | 2 ++ .../jobs/developer-data-architect/contents.lr | 4 +++ .../jobs/senior-system-administrator/contents.lr | 4 +++ content/about/people/contents.lr | 2 ++ content/about/reports/contents.lr | 2 ++ content/about/sponsors/contents.lr | 2 ++ content/contact/contents.lr | 2 ++ content/contents.lr | 2 ++ content/download/contents.lr | 2 ++ content/download/languages/contents.lr | 2 ++ content/download/options/contents.lr | 2 ++ content/press/contents.lr | 2 ++ databags/menu+es.ini | 4 +-- databags/menu+fr.ini | 4 +-- models/jobs.ini | 6 +++++ models/page.ini | 5 ++++ models/people.ini | 6 +++++ models/press.ini | 6 +++++ models/reports.ini | 6 +++++ models/sponsors.ini | 6 +++++ templates/contact.html | 30 +++++++++++----------- templates/download-android.html | 12 ++++----- templates/download-languages.html | 2 +- templates/download-options.html | 2 +- templates/download.html | 4 +-- templates/footer.html | 4 +-- templates/header.html | 2 +- templates/hero-download.html | 10 ++++---- templates/macros/jobs.html | 8 +++--- templates/macros/reports.html | 4 +-- templates/pagenav.html | 2 +- templates/people.html | 8 +++--- templates/press.html | 26 +++++++++---------- templates/projects.html | 4 +-- templates/reports.html | 10 ++++---- templates/sponsors.html | 8 +++--- 40 files changed, 146 insertions(+), 73 deletions(-)