Cleanup merge conflicts
This commit is contained in:
		| @@ -5,372 +5,188 @@ | ||||
| </div> | ||||
|  | ||||
| <div class="table-responsive"> | ||||
| 	<<<<<<< HEAD <table class="table sortable-theme-bootstrap" data-sortable> | ||||
| 		<thead> | ||||
| 			<tr> | ||||
| 				<th data-sortable="true">Email Service</th> | ||||
| 				<th data-sortable="false">Website</th> | ||||
| 				<th data-sortable="true">Since</th> | ||||
| 				<th data-sortable="true">Server</th> | ||||
| 				<th data-sortable="true">Storage</th> | ||||
| 				<th data-sortable="true">Price / Year</th> | ||||
| 				<th data-sortable="true">Bitcoin</th> | ||||
| 				<th data-sortable="true">Encryption</th> | ||||
| 				<th data-sortable="true">Own Domain</th> | ||||
| 			</tr> | ||||
| 		</thead> | ||||
|   <table class="table sortable-theme-bootstrap" data-sortable> | ||||
|     <thead> | ||||
|       <tr> | ||||
|         <th data-sorted="true" data-sorted-direction="descending">Email Provider</th> | ||||
|         <th data-sortable="false">Website</th> | ||||
|         <th data-sortable="true">Since</th> | ||||
|         <th data-sortable="true">Jurisdiction</th> | ||||
|         <th data-sortable="true">Storage</th> | ||||
|         <th data-sortable="true">Yearly Price</th> | ||||
|         <th data-sortable="true">Bitcoin</th> | ||||
|         <th data-sortable="true">Encryption</th> | ||||
|         <th data-sortable="true">Own Domain</th> | ||||
|       </tr> | ||||
|     </thead> | ||||
|  | ||||
| 		<tbody> | ||||
|     <tbody> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="ProtonMail"> | ||||
| 					<img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2013">2013</td> | ||||
| 				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
| 				<td data-value="500">500 MB</td> | ||||
| 				<td data-value="0"><span class="label label-warning">Free</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="ProtonMail"> | ||||
|           <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2013">2013</td> | ||||
|         <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
|         <td data-value="500">500 MB</td> | ||||
|         <td data-value="0"><span class="label label-warning">Free</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="disroot.org"> | ||||
| 					<img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2015">2015</td> | ||||
| 				<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td> | ||||
| 				<td data-value="2000">2 GB</td> | ||||
| 				<td data-value="1"><span class="label label-warning">Free</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="disroot.org"> | ||||
|           <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2015">2015</td> | ||||
|         <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td> | ||||
|         <td data-value="2000">2 GB</td> | ||||
|         <td data-value="1"><span class="label label-warning">Free</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="Tutanota"> | ||||
| 					<img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2011">2011</td> | ||||
| 				<td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
| 				<td data-value="1000">1 GB</td> | ||||
| 				<td data-value="0"><span class="label label-warning">Free</span></td> | ||||
| 				<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="Tutanota"> | ||||
|           <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2011">2011</td> | ||||
|         <td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
|         <td data-value="1000">1 GB</td> | ||||
|         <td data-value="0"><span class="label label-warning">Free</span></td> | ||||
|         <td data-value="0"><span class="label label-primary">No</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="Mailfence"> | ||||
| 					<img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2013">2013</td> | ||||
| 				<td><span class="flag-icon flag-icon-be"></span> Belgium</td> | ||||
| 				<td data-value="500">500 MB</td> | ||||
| 				<td data-value="0"><span class="label label-warning">Free</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="Mailfence"> | ||||
|           <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2013">2013</td> | ||||
|         <td><span class="flag-icon flag-icon-be"></span> Belgium</td> | ||||
|         <td data-value="500">500 MB</td> | ||||
|         <td data-value="0"><span class="label label-warning">Free</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="mailbox.org"> | ||||
| 					<img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70"> | ||||
|       <tr> | ||||
|         <td data-value="mailbox.org"> | ||||
|           <img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70"> | ||||
|  | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 " height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2014">2014</td> | ||||
| 				<td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
| 				<td data-value="2000">2 GB</td> | ||||
| 				<td data-value="13">12 €</td> | ||||
| 				<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2014">2014</td> | ||||
|         <td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
|         <td data-value="2000">2 GB</td> | ||||
|         <td data-value="13">12 €</td> | ||||
|         <td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="Posteo"> | ||||
| 					<img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2009">2009</td> | ||||
| 				<td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
| 				<td data-value="2000">2 GB</td> | ||||
| 				<td data-value="13">12 €</td> | ||||
| 				<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="Posteo"> | ||||
|           <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2009">2009</td> | ||||
|         <td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
|         <td data-value="2000">2 GB</td> | ||||
|         <td data-value="13">12 €</td> | ||||
|         <td data-value="0"><span class="label label-primary">No</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="0"><span class="label label-primary">No</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="Runbox"> | ||||
| 					<img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70"> | ||||
|       <tr> | ||||
|         <td data-value="Runbox"> | ||||
|           <img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70"> | ||||
|  | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="1999">1999</td> | ||||
| 				<td><span class="flag-icon flag-icon-no"></span> Norway</td> | ||||
| 				<td data-value="1000">1 GB</td> | ||||
| 				<td data-value="20">$ 19.95</td> | ||||
| 				<td data-value="1"><span class="label label-primary">Yes</span></td> | ||||
| 				<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="1999">1999</td> | ||||
|         <td><span class="flag-icon flag-icon-no"></span> Norway</td> | ||||
|         <td data-value="1000">1 GB</td> | ||||
|         <td data-value="20">$ 19.95</td> | ||||
|         <td data-value="1"><span class="label label-primary">Yes</span></td> | ||||
|         <td data-value="0"><span class="label label-primary">No</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="Neomailbox"> | ||||
| 					<img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2003">2003</td> | ||||
| 				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
| 				<td data-value="1000">1 GB</td> | ||||
| 				<td data-value="50">$ 49.95</td> | ||||
| 				<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="Neomailbox"> | ||||
|           <img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2003">2003</td> | ||||
|         <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
|         <td data-value="1000">1 GB</td> | ||||
|         <td data-value="50">$ 49.95</td> | ||||
|         <td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="StartMail"> | ||||
| 					<img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2014">2014</td> | ||||
| 				<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td> | ||||
| 				<td data-value="10000">10 GB</td> | ||||
| 				<td data-value="60">$ 59.95</td> | ||||
| 				<td data-value="0"><span class="label label-success">Accepted</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="StartMail"> | ||||
|           <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2014">2014</td> | ||||
|         <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td> | ||||
|         <td data-value="10000">10 GB</td> | ||||
|         <td data-value="60">$ 59.95</td> | ||||
|         <td data-value="0"><span class="label label-success">Accepted</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 			<tr> | ||||
| 				<td data-value="Kolab Now"> | ||||
| 					<img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70"> | ||||
| 				</td> | ||||
| 				<td> | ||||
| 					<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 				</td> | ||||
| 				<td data-value="2010">2010</td> | ||||
| 				<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
| 				<td data-value="2048">2 GB</td> | ||||
| 				<td data-value="60">$ 60</td> | ||||
| 				<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 				<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 				<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 			</tr> | ||||
|       <tr> | ||||
|         <td data-value="Kolab Now"> | ||||
|           <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70"> | ||||
|         </td> | ||||
|         <td> | ||||
|           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
|         </td> | ||||
|         <td data-value="2010">2010</td> | ||||
|         <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
|         <td data-value="2048">2 GB</td> | ||||
|         <td data-value="60">$ 60</td> | ||||
|         <td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
|         <td data-value="0"><span class="label label-primary">No</span></td> | ||||
|         <td data-value="1"><span class="label label-success">Yes</span></td> | ||||
|       </tr> | ||||
|  | ||||
| 		</tbody> | ||||
| 		</table> | ||||
| 		======= | ||||
| 		<table class="table sortable-theme-bootstrap" data-sortable> | ||||
| 			<thead> | ||||
| 				<tr> | ||||
| 					<th data-sorted="true" data-sorted-direction="descending">Email Provider</th> | ||||
| 					<th data-sortable="false">Website</th> | ||||
| 					<th data-sortable="true">Since</th> | ||||
| 					<th data-sortable="true">Jurisdiction</th> | ||||
| 					<th data-sortable="true">Storage</th> | ||||
| 					<th data-sortable="true">Yearly Price</th> | ||||
| 					<th data-sortable="true">Bitcoin</th> | ||||
| 					<th data-sortable="true">Encryption</th> | ||||
| 					<th data-sortable="true">Own Domain</th> | ||||
| 				</tr> | ||||
| 			</thead> | ||||
|  | ||||
| 			<tbody> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="ProtonMail"> | ||||
| 						<img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2013">2013</td> | ||||
| 					<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
| 					<td data-value="500">500 MB</td> | ||||
| 					<td data-value="0"><span class="label label-warning">Free</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="disroot.org"> | ||||
| 						<img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2015">2015</td> | ||||
| 					<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td> | ||||
| 					<td data-value="2000">2 GB</td> | ||||
| 					<td data-value="1"><span class="label label-warning">Free</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="Tutanota"> | ||||
| 						<img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2011">2011</td> | ||||
| 					<td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
| 					<td data-value="1000">1 GB</td> | ||||
| 					<td data-value="0"><span class="label label-warning">Free</span></td> | ||||
| 					<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="Mailfence"> | ||||
| 						<img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2013">2013</td> | ||||
| 					<td><span class="flag-icon flag-icon-be"></span> Belgium</td> | ||||
| 					<td data-value="500">500 MB</td> | ||||
| 					<td data-value="0"><span class="label label-warning">Free</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="mailbox.org"> | ||||
| 						<img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70"> | ||||
|  | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 " height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2014">2014</td> | ||||
| 					<td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
| 					<td data-value="2000">2 GB</td> | ||||
| 					<td data-value="13">12 €</td> | ||||
| 					<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="Posteo"> | ||||
| 						<img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2009">2009</td> | ||||
| 					<td><span class="flag-icon flag-icon-de"></span> Germany</td> | ||||
| 					<td data-value="2000">2 GB</td> | ||||
| 					<td data-value="13">12 €</td> | ||||
| 					<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="Runbox"> | ||||
| 						<img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70"> | ||||
|  | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="1999">1999</td> | ||||
| 					<td><span class="flag-icon flag-icon-no"></span> Norway</td> | ||||
| 					<td data-value="1000">1 GB</td> | ||||
| 					<td data-value="20">$ 19.95</td> | ||||
| 					<td data-value="1"><span class="label label-primary">Yes</span></td> | ||||
| 					<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="Neomailbox"> | ||||
| 						<img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2003">2003</td> | ||||
| 					<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
| 					<td data-value="1000">1 GB</td> | ||||
| 					<td data-value="50">$ 49.95</td> | ||||
| 					<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="StartMail"> | ||||
| 						<img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2014">2014</td> | ||||
| 					<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td> | ||||
| 					<td data-value="10000">10 GB</td> | ||||
| 					<td data-value="60">$ 59.95</td> | ||||
| 					<td data-value="0"><span class="label label-success">Accepted</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Built-in</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 				<tr> | ||||
| 					<td data-value="Kolab Now"> | ||||
| 						<img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70"> | ||||
| 					</td> | ||||
| 					<td> | ||||
| 						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> | ||||
| 					</td> | ||||
| 					<td data-value="2010">2010</td> | ||||
| 					<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td> | ||||
| 					<td data-value="2048">2 GB</td> | ||||
| 					<td data-value="60">$ 60</td> | ||||
| 					<td data-value="1"><span class="label label-success">Accepted</span></td> | ||||
| 					<td data-value="0"><span class="label label-primary">No</span></td> | ||||
| 					<td data-value="1"><span class="label label-success">Yes</span></td> | ||||
| 				</tr> | ||||
|  | ||||
| 			</tbody> | ||||
| 		</table> | ||||
| 		>>>>>>> origin/master | ||||
|     </tbody> | ||||
|   </table> | ||||
| </div> | ||||
|  | ||||
| <h3>Interesting Email Providers Under Development</h3> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 nitrohorse
					nitrohorse