Aneta d64cd84e6a Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb ... Conflicts: mamweb/templates/menu.html seminar/templates/seminar/novinky.html seminar/views.py		2015-09-12 12:31:15 +02:00
..
seminar	Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb	2015-09-12 12:31:15 +02:00