Aneta 9f3bd3f9fd Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb ... Conflicts: seminar/templates/seminar/titulnistrana.html		2015-09-13 18:07:45 +02:00
..
seminar	Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb	2015-09-13 18:07:45 +02:00