Merge pull request #199 from germainelee/germainelee-patch-footer

Add link to newsletter in footer and link to merch store

Author: gabek

layouts/partials/footer/footer.html

@@ -4,6 +4,8 @@
     <li><a href="/faq">FAQ</a></li>
     <li><a href="https://videos.owncast.online">Videos</a></li>
     <li><a href="https://directory.owncast.online">Directory</a></li>
+    <li><a href="https://merch.owncast.online">Merch Store</a></li>
+    <li><a href="/newsletter">Newsletter</a></li>
     <li><a href="/roadmap">Roadmap</a></li>
     <li><a href="/contribute">Code of Conduct</a></li>
     <li><a href="/trademark">Trademark</a></li>

layouts/partials/header/header.html

@@ -34,6 +34,9 @@
           <li class="nav-item">
             <a class="nav-link" href="https://directory.owncast.online" target="_blank" rel="noopener noreferrer">Directory</a>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" href="https://merch.owncast.online" target="_blank" rel="noopener noreferrer">Shop</a>
+          </li>
       </ul>
       <div class="break order-6 d-md-none"></div>
       <form class="navbar-form flex-grow-1 order-7 order-md-3">