Merge remote-tracking branch 'origin/headlines'

manually merge PR #20 #20
to handle conflicts
This commit is contained in:
Solene Rapenne 2021-10-03 11:59:11 +02:00
commit c8f249a86a
3 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
<article id="headlines">
<h1>Headlines</h1>
<h1>TL;DR</h1>
<ul>
<li>OpenBSD 7.0 release very soon</li>
</ul>

View File

@ -1,5 +1,5 @@
<!-- SECTION -->
<h1>Headlines</h1>
<h1>TL;DR</h1>
<ul>
<li>OpenBSD 7.0 release very soon</li>
<li>LibreSSL problem with Let's Encrypt certificates</li>

View File

@ -1,5 +1,5 @@
<!-- SECTION -->
<h1>Headlines</h1>
<h1>TL;DR</h1>
<ul>
<li>OpenBSD 7.0 released!</li>
<li>No more packages updates for 6.9, syspatch will still be published</li>