From 12905b2d33db16e3decfff95a3dd49449bb1f0f5 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Thu, 3 Sep 2015 18:08:38 +0200
Subject: [PATCH 1/2] Sjednoceni polozek aktualni zadani na jedno url

---
 seminar/templates/seminar/zadani/submenu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seminar/templates/seminar/zadani/submenu.html b/seminar/templates/seminar/zadani/submenu.html
index 8c67e9bf..92c10be5 100644
--- a/seminar/templates/seminar/zadani/submenu.html
+++ b/seminar/templates/seminar/zadani/submenu.html
@@ -1,7 +1,7 @@
 {% with "/zadani" as cesta %}
 
 <ul>
-  <li><a href="{{cesta}}/aktualni-zadani/">Aktuální zadání</a>
+  <li><a href="{{cesta}}/aktualni/">Aktuální zadání</a>
   <li><a href="{{cesta}}/ulohy/">Úlohy</a>
   <li><a href="{{cesta}}/temata/">Témata</a>
   <li><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a>

From 4ce05750c51fc7b89b25f3a1e41daf47c0ee24c2 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Thu, 3 Sep 2015 19:45:53 +0200
Subject: [PATCH 2/2] Pridani se mezi adminy

---
 mamweb/settings_prod.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mamweb/settings_prod.py b/mamweb/settings_prod.py
index 29074b48..e96d0938 100644
--- a/mamweb/settings_prod.py
+++ b/mamweb/settings_prod.py
@@ -37,6 +37,7 @@ import os
 SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz'
 ADMINS = [
         ('Tomas Gavenciak', 'gavento@ucw.cz'),
+        ('Petr Pecha', 'nejlepsitextovyeditorjevim@gmail.com'),
         ]