GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 45cedd84 authored by Hiro's avatar Hiro 🏄

Merge remote-tracking branch 'anto-gl/master' into staging

parents 1b2a2910 cfd88bad
......@@ -42,7 +42,7 @@
<div class="container">
<div class="row p-5 my-5 border text-center">
<p>
Community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.txt" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_values.txt" title="Statement of Values" target="_blank">Statement of Values</a>.
Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.txt" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_values.txt" title="Statement of Values" target="_blank">Statement of Values</a>.
</p>
</div>
</div>
......@@ -51,10 +51,9 @@
<h3 class="col-12 text-primary display-4">Shallot Onion Members</h3>
<div class="col-md-4 col-xl-4 my-2">
<div class="card border-1 h-100">
<img class="card-img-top" src="{{ '../../static/images/membership/logos/MullvadVPN.svg' }}" alt="MullvadVPN">
<img class="card-img-top" src="#" alt="">
<div class="card-body">
<p><a href="#" class="h4">Mullvad VPN</a></p>
Mullvad is a VPN service that helps users keep their online activity, identity, and location private. With a fundamental belief in privacy as a universal right, Mullvad's ultimate goal is to make Internet censorship and mass surveillance ineffective.
<p><a href="#" class="h4"></a></p>
</div>
</div>
</div>
......@@ -81,12 +80,12 @@
<h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3>
<div class="col-md-3 col-xl-3 my-2">
<div class="card border-1 h-100">
<img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast">
<img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast">
</div>
</div>
<div class="col-md-3 col-xl-3 my-2">
<div class="card border-1 h-100">
<img class="card-img-top" src="#" alt="">
<img class="card-img-top p-3" src="{{ '../../static/images/membership/logos/MullvadVPN.png' }}" alt="MullvadVPN">
</div>
</div>
<div class="col-md-3 col-xl-3 my-2">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment