commit c19627b70543c86a6e0592a8edaaa9754a11cc63 Merge: 185acdd0 323d5aa1 Author: gus gus@torproject.org Date: Thu Aug 20 16:15:41 2020 -0400

Merge branch 'staging' of git-rw.torproject.org:project/web/tpo into staging

assets/static/images/membership/header.png | Bin 0 -> 334841 bytes assets/static/images/membership/logos/Avast.png | Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 +++++++++++++++++++++ .../static/images/sponsors/Bertha_Foundation.jpg | Bin 0 -> 451667 bytes content/about/membership/contents.lr | 2 +- content/about/sponsors/Bertha/contents.lr | 19 ++ templates/membership.html | 105 +++++------ 8 files changed, 262 insertions(+), 61 deletions(-)