Merge upstream

2022-10-10 12:47:38 -04:00
parent f4ebff5cda
commit fd4e05cc7d
80 changed files with 1685 additions and 3017 deletions
--- a/blog.bryanroessler.com/index.html
+++ b/blog.bryanroessler.com/index.html
@@ -4,6 +4,7 @@ title:
 subtitle:
 use-site-title: false
 ---
+<<<<<<< HEAD

 <div class="posts-list">
  {% for post in paginator.posts %}
@@ -70,3 +71,5 @@ use-site-title: false
  {% endif %}
 </ul>
 {% endif %}
+=======
+>>>>>>> upstream/master