mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'test' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into test

Browse source
This commit is contained in:
Tomas "Jethro" Pokorny 2018-09-14 20:31:50 +02:00
commit 98aacc3b43
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mamweb/settings_prod.py
View file

@ -50,7 +50,7 @@ SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz'
ADMINS = [ ADMINS = [
('Tomas Gavenciak', 'gavento@gmail.com'), ('Tomas Gavenciak', 'gavento@gmail.com'),
('Matěj Kocián', 'matej.kocian@gmail.com'), ('Matěj Kocián', 'matej.kocian@gmail.com'),
('M&M ERRORs', 'mam-errors@atrey.karlin.mff.cuni.cz'), ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'),
] ]

2
mamweb/settings_test.py
View file

@ -52,7 +52,7 @@ import os
SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz' SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz'
ADMINS = [ ADMINS = [
('M&M ERRORs', 'mam-errors@atrey.karlin.mff.cuni.cz'), ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'),
] ]

5
seminar/templates/seminar/archiv/obalky.tex
View file

@ -68,13 +68,16 @@
\def\stat{#7}% \def\stat{#7}%
\hbox{\tofont{\jmeno\ \prijm}} \hbox{\tofont{\jmeno\ \prijm}}
\vskip .2 em
\ifx \skola \empty \ifx \skola \empty
{} {}
\else \else
\hbox{\tofont{\skola}} \hbox{\tofont{\skola}}
\fi \fi
\vskip .2 em
\hbox{\tofont{\ulice}} \hbox{\tofont{\ulice}}
\vskip .2 em
\vskip .2 em
\hbox to 18pt{\tofont{\predsunout{\PSC\ }\mesto}} \hbox to 18pt{\tofont{\predsunout{\PSC\ }\mesto}}
\vskip 5 pt \vskip 5 pt
\tofont{\stat} \tofont{\stat}