Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/favicon.ico
This commit is contained in:
Aidan 2024-12-19 22:19:06 -05:00
commit 1c75722705
No known key found for this signature in database
GPG Key ID: 1773A01F0EFE4FC1
3 changed files with 7 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -36,9 +36,13 @@
<b>Email:</b> <span class="text-slate-300 ml-1">aidan.honor[at]androidintegrity[dot]org (PGP encryption preferred)</span>
</li>
<li class="flex items-center">
<i class="fas fa-comments text-green-400 mr-2"></i>
<i class="fas fa-comments text-blue-400 mr-2"></i>
<b>Signal:</b> <span class="text-slate-300 ml-1">[at]iusearchbtw.17</span>
</li>
<li class="flex items-center">
<i class="fas fa-comments text-green-400 mr-2"></i>
<b>Matrix:</b> <span class="text-slate-300 ml-1">@ihatenodejs:nope.chat</span>
</li>
<li class="flex items-center">
<i class="fab fa-telegram-plane text-blue-400 mr-2"></i>
<b>Telegram:</b> <span class="text-slate-300 ml-1">[at]iusearchbtw42</span>

View File

@ -27,7 +27,7 @@
</li>
<li class="text-white">
<strong>p0ntus mail</strong><br>
<a href="https://github.com/ihatenodejs/pontus-mail" class="text-gray-300 underline">Repo public</a> | <a href="https://mail.p0ntus.com" class="text-gray-300 underline">Website</a><br>
<a href="https://github.com/ihatenodejs/pontus-mail" class="text-gray-300 underline">Repo public</a> | <a href="https://pontusmail.org" class="text-gray-300 underline">Website</a><br>
<span class="text-gray-300">Mailcow/Docker</span><br>
<span class="text-gray-300">My self-hosted public email service</span>
</li>
@ -72,4 +72,4 @@
<p class="text-slate-300 mb-4">Most of my projects are considered production-ready, although will always recieve updates and changes, thus being considered in progress.</p>
</div>
<script src="js/main.js"></script>
<%- include('shards/footer.ejs') %>
<%- include('shards/footer.ejs') %>