Merge branch 'master' of https://git.ellpeck.de/Ellpeck/Web

main/_data/about.json

@@ -8,7 +8,7 @@
     },
     {
         "q": "Where are you from?",
-        "a": "I am from Neuss, Germany and I'm currently living and going to university in Aachen, Germany. I'm moving soon, though, so let's see if I remember to update this then."
+        "a": "I am from Neuss, Germany and I currently live in Neu-Ulm, Germany."
     },
     {
         "q": "Why are you called Ellpeck?",

main/_includes/footer.html

@@ -4,7 +4,7 @@
 
 <!-- Footer -->
 <div class="footer rounded-top">
-    <span class="text-muted"><a href="https://git.ellpeck.de/Ellpeck/Web">&copy; 2018-2021 Ellpeck</a> &ndash; <a href="/impressum">Impressum</a> &ndash; <a href="/privacy">Privacy</a></span>
+    <span class="text-muted"><a href="https://git.ellpeck.de/Ellpeck/Web">&copy; 2018-2021 Ellpeck</a> &ndash; <a href="/impressum">Impressum</a> &ndash; <a href="/privacy">Privacy</a> &ndash; <a href="https://status.ellpeck.de">Status</a></span>
     <div class="quote">
         <span id="quote-text"></span>
         <script src="/scripts/quote.js"></script>

main/actaddmanual/index.html

@@ -40,6 +40,7 @@
         <a href="https://ellpeck.de">🏠 Main Site</a>
         <a href="https://ellpeck.de/impressum">📜 Impressum</a>
         <a href="https://ellpeck.de/privacy">🙈 Privacy</a>
+        <a href="https://status.ellpeck.de">🚦 Status</a>
         <a href="https://git.ellpeck.de/Ellpeck/Web">&copy; Ellpeck</a>
     </div>
     <div id="content">

main/commissions/index.html

@@ -95,6 +95,6 @@
     </div>
 
     <div class="footer">
-        <a href="https://git.ellpeck.de/Ellpeck/Web">&copy; 2021 Ellpeck</a> &ndash; <a href="https://ellpeck.de/impressum">Impressum</a> &ndash; <a href="https://ellpeck.de/privacy">Privacy</a>
+        <a href="https://git.ellpeck.de/Ellpeck/Web">&copy; 2021 Ellpeck</a> &ndash; <a href="https://ellpeck.de/impressum">Impressum</a> &ndash; <a href="https://ellpeck.de/privacy">Privacy</a> &ndash; <a href="https://status.ellpeck.de">Status</a>
     </div>
 </body>

main/impressum.html

@@ -9,8 +9,8 @@ nav: nav/miscnav.html
     <h1>📜 Impressum</h1>
     <p>
         Julian Schubert
-        <br>Kastanienweg 27
-        <br>52074 Aachen
+        <br>Meininger Allee 9
+        <br>89231 Neu-Ulm
     </p>
     <p>
         Telefon: 0241 45093753