Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb
This commit is contained in:
		
						commit
						5710434de5
					
				
					 2 changed files with 2 additions and 1 deletions
				
			
		|  | @ -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'), | ||||
|         ] | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -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> | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Aneta
						Aneta