Matej Lieskovsky 0705ea07bc Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb ... Conflicts: seminar/templates/seminar/zadani/AktualniZadani.html		2015-09-13 20:44:48 +02:00
..
seminar	Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb	2015-09-13 20:44:48 +02:00