diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index af12dc0c..0c233630 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -17,7 +17,7 @@
<<<<<<< HEAD -

ProtonMail {% include badge.html color="info" text="Free" %}

+

ProtonMail {% include badge.html color="info" text="Free" %}

ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

=======

ProtonMail {% include badge.html color="info" text="Free" %}

@@ -60,7 +60,7 @@
<<<<<<< HEAD -

Mailbox.org {% include badge.html color="info" text="€12/y" %}

+

Mailbox.org {% include badge.html color="info" text="€12/y" %}

Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

=======

Mailbox.org {% include badge.html color="info" text="€12/y" %}

@@ -102,7 +102,7 @@
<<<<<<< HEAD -

Posteo {% include badge.html color="info" text="€12/y" %}

+

Posteo {% include badge.html color="info" text="€12/y" %}

Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

=======

Posteo {% include badge.html color="info" text="€12/y" %}

@@ -144,7 +144,7 @@
<<<<<<< HEAD -

Disroot {% include badge.html color="info" text="Free" %}

+

Disroot {% include badge.html color="info" text="Free" %}

Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

=======

Disroot {% include badge.html color="info" text="Free" %}

@@ -186,7 +186,7 @@
<<<<<<< HEAD -

Tutanota {% include badge.html color="info" text="Free" %}

+

Tutanota {% include badge.html color="info" text="Free" %}

Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

=======

Tutanota {% include badge.html color="info" text="Free" %}

@@ -233,7 +233,7 @@
<<<<<<< HEAD -

StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

+

StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

=======

StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

diff --git a/pages/donate.html b/pages/donate.html index 34ff5bc8..57c46622 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -33,7 +33,7 @@ permalink: /donate/
<<<<<<< HEAD - + ======= >>>>>>> fix @@ -44,7 +44,7 @@ permalink: /donate/
<<<<<<< HEAD - + ======= >>>>>>> fix @@ -55,7 +55,7 @@ permalink: /donate/
<<<<<<< HEAD - + ======= >>>>>>> fix @@ -66,7 +66,7 @@ permalink: /donate/
<<<<<<< HEAD - + ======= >>>>>>> fix @@ -77,7 +77,7 @@ permalink: /donate/
<<<<<<< HEAD - + ======= >>>>>>> fix @@ -88,7 +88,7 @@ permalink: /donate/
<<<<<<< HEAD - + ======= >>>>>>> fix @@ -99,7 +99,7 @@ permalink: /donate/
<<<<<<< HEAD - + ======= >>>>>>> fix diff --git a/pages/sponsors.html b/pages/sponsors.html index 67b68b49..329cc33d 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -50,7 +50,7 @@ permalink: /sponsors/

This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

<<<<<<< HEAD

Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

-
Backers - $10–$24
+
Backers - $10–$24
=======

Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

Backers - $10–$24