commit 992048474405c20504f8528bdd93bdb39568caae Merge: 45325bd0 647c3f8d Author: Antonela antonela@torproject.org Date: Mon Jul 27 13:51:28 2020 +0000

Merge branch 'master' into 'master'

Rebase master

See merge request antonela/tpo!2

assets/static/images/membership/green.png | Bin 0 -> 239288 bytes 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.svg | 197 +++++++++++++++++++++ assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes .../static/images/sponsors/Bertha_Foundation.jpg | Bin 0 -> 451667 bytes content/about/membership/contents.lr | 13 ++ content/about/sponsors/Bertha/contents.lr | 19 ++ templates/membership.html | 138 +++++++++++++++ 10 files changed, 367 insertions(+)