From 71ecc9f94213366d54eb3aba3d1c0dff46410ebc Mon Sep 17 00:00:00 2001
From: nils <nils@brennbach.de>
Date: Wed, 10 Jan 2018 14:21:04 +0100
Subject: [PATCH 1/3] copyright now from 2017 til 2018

---
 web_dev/sas_web/templates/public/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_dev/sas_web/templates/public/footer.html b/web_dev/sas_web/templates/public/footer.html
index 42a1ad8..59d0524 100644
--- a/web_dev/sas_web/templates/public/footer.html
+++ b/web_dev/sas_web/templates/public/footer.html
@@ -14,6 +14,6 @@
         <br>
         <br>
         <br>
-        <center class="footer-center">C.M., N.H. © 2017 | <a class="link-to-contact" href="{% url "meingoethopia:question_new" %}">Kontakt</a> | <a class="link-to-contact" href="{% url "admin:index" %}">Admin</a> | <a class="link-to-contact" href="{% url "startpage:impressum" %}">Impressum</a></center>
+        <center class="footer-center">C.M., N.H. © 2017 - 2018 | <a class="link-to-contact" href="{% url "meingoethopia:question_new" %}">Kontakt</a> | <a class="link-to-contact" href="{% url "admin:index" %}">Admin</a> | <a class="link-to-contact" href="{% url "startpage:impressum" %}">Impressum</a></center>
         <br>
 </div>

From 1a3c5c85b8c7373e2bb5a50c88049ae6481491b0 Mon Sep 17 00:00:00 2001
From: nils <nils@brennbach.de>
Date: Wed, 10 Jan 2018 14:23:13 +0100
Subject: [PATCH 2/3] =?UTF-8?q?renamed=20"Wahlprogramm"=20->=20"=C3=9Cber?=
 =?UTF-8?q?=20mich"=20for=20presidents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_dev/sas_web/news/templates/news/praesident.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_dev/sas_web/news/templates/news/praesident.html b/web_dev/sas_web/news/templates/news/praesident.html
index 7e16469..e71a6c3 100644
--- a/web_dev/sas_web/news/templates/news/praesident.html
+++ b/web_dev/sas_web/news/templates/news/praesident.html
@@ -24,7 +24,7 @@
     </tr>
     <tr class="trpartei">
         <td>
-            <p><b>Wahlprogramm</b></p>        
+            <p><b>Über mich:</b></p>        
         </td>
         <td>
             <p>{{ entry.wahlprogramm|linebreaks }}</p>

From 303c8c6615a6a08c57cc7281b5bed0a0057080f4 Mon Sep 17 00:00:00 2001
From: nils <nils@brennbach.de>
Date: Wed, 10 Jan 2018 21:42:51 +0100
Subject: [PATCH 3/3] removed deadlines that already passed

---
 web_dev/sas_web/startpage/templates/startpage/index.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web_dev/sas_web/startpage/templates/startpage/index.html b/web_dev/sas_web/startpage/templates/startpage/index.html
index ea8319c..e3267f6 100644
--- a/web_dev/sas_web/startpage/templates/startpage/index.html
+++ b/web_dev/sas_web/startpage/templates/startpage/index.html
@@ -7,9 +7,6 @@
         <td width=70%>
             <h1 class="red" id="termine">Termine</h1>
             <ul class="dates_ul">
-                <li class="dates"><b>22.12.2017:</b> Deadline für Parteianmeldungen</li>
-                <li class="dates"><b>22.12.2017:</b> Deadline für Präsidentschaftsbewerbungen</li>
-                <li class="dates"><b>06.01.2018:</b> Eröffnung des Wahlkampfes</li>
                 <li class="dates"><b>01.02.2018:</b> Wahl</li>
             </ul>
             <h1 class="red" id="verfassung">Verfassung</h1>